origen 0.7.45 → 0.7.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 816ceb3d0f393ee76db97ce78c88ac9bb920a880
-  data.tar.gz: 98bd761e01d12b56e13df84bd523bd5a97f9af39
+  metadata.gz: 8aa96dc40d731d65be9719183658fed3eaa4b059
+  data.tar.gz: 6acae3a224086bd332b90cd2d9ebbe4fc056ab61
 SHA512:
-  metadata.gz: 29b35509aa06de548d11dea0ba6cb3187c266aa1dfaad2929a6d0981902499f4a2680b879e8606e51283b8cd3a96917d779e0d46e86d65a2880c5bedec1dea79
-  data.tar.gz: 0f901ffc7dc4ccffc832b28d6885ba9c32a6415ef20c41af44e2fa016a21d1637b3c8ddc87c37471d9a2042b0452191cb5b055d7feea9437613b3bb5450959f7
+  metadata.gz: 26689bc47d753ad5e51eba5e1bdfddfaca1553baaefa5906dd4404db569a5b2c7a5bc1bc3aacabe77d4020303eb32965f0624a990c7b63db1630250823552ded
+  data.tar.gz: 0a94636dd35a31dd73aad8c474ffeab045aa84dc37dc9fe13115dd6ddf1cfb9ebc32ca4544a0c48642d647da91b4539db1a660b194f7ecc7dbb9caf74dc77c1f

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 45
+  BUGFIX = 46
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/application.rb

@@ -181,6 +181,18 @@ module Origen
     end
     alias_method :imports_dir, :imports_directory
 
+    # Returns a path to the remotes directory for the application. e.g. if the app live
+    # at /home/thao/my_app, then the remotes directory will typically
+    # be /home/thao/.my_app_remotes_DO_NOT_HAND_MODIFY
+    #
+    # Origen will ensure that this directory is outside of the scope of the current application's revision
+    # control system. This prevents conflicts with the revision control system for the application and those
+    # used to import 3rd party dependencies
+    def remotes_directory
+      workspace_manager.remotes_directory
+    end
+    alias_method :remotes_dir, :remotes_directory
+
     # Returns the namespace used by the application as a string
     def namespace
       @namespace ||= self.class.to_s.split('::').first.gsub('_', '').sub('Application', '')

data/lib/origen/application/lsf.rb

@@ -37,11 +37,13 @@ module Origen
       # Example
       #   # soc/nevis.rb
       #
-      #   ORIGEN::Runner::LSF.configuration do |config|
-      #   # Use "msg.nevis" for the project string when running in Noida
-      #   if %x["domainname"] =~ /nidc/
-      #     Origen.config.lsf.project =  "msg.nevis"
+      #   Origen::Runner::LSF.configuration do |config|
+      #     # Use "msg.nevis" for the project string when running in Noida
+      #     if %x["domainname"] =~ /nidc/
+      #       config.lsf.project =  "msg.nevis"
+      #     end
       #   end
+      #
       #   # Change the default group
       #   Origen.config.lsf.group = "lam"
       def self.configuration

data/lib/origen/pins/pin.rb

@@ -73,6 +73,7 @@ module Origen
         @size = 1
         @value = 0
         @clock = nil
+        @meta = options[:meta] || {}
         on_init(owner, options)
         # Assign the initial state from the method so that any inversion is picked up...
         send(@reset)
@@ -159,7 +160,13 @@ module Origen
           default = instance_variable_get("@#{attribute}")
           if options[:function]
             v = functions[:ids][options[:function]][attribute]
-            return v if v
+            if v
+              if v.is_a?(Hash) && default.is_a?(Hash)
+                return default.merge(v) # v will overwrite any default values
+              else
+                return v
+              end
+            end
             # else fall back to context-based lookup
           end
           mode_id = options[:mode] || current_mode_id
@@ -170,7 +177,16 @@ module Origen
             config_id = config_id.to_sym if config_id
             configuration = mode[config_id] || mode[:all]
             if configuration
-              configuration[attribute] || default
+              v = configuration[attribute]
+              if v
+                if v.is_a?(Hash) && default.is_a?(Hash)
+                  return default.merge(v) # v will overwrite any default values
+                else
+                  return v
+                end
+              else
+                default
+              end
             else
               default
             end
@@ -863,6 +879,10 @@ module Origen
         @clock.next_edge
       end
 
+      def duty_cycles
+        @clock.cycles_per_duty
+      end
+
       def half_period
         @clock.cycles_per_half_period
       end

data/lib/origen/pins/pin_clock.rb

@@ -1,123 +1,137 @@
 module Origen
   module Pins
     class PinClock
-      attr_accessor :running
-      attr_accessor :cycles_per_half_period
-      attr_accessor :last_edge
-      attr_accessor :next_edge
+      attr_reader :cycles_per_duty, :last_edge, :next_edge
 
       def initialize(owner, options = {})
         @owner = owner
         @running = false
-        @cycles_per_half_period = 0
-        @ns_per_half_period = 0
-        update_half_period(options)
-      end
 
-      def running?
-        @running
+        @clock_period_in_ns = 0
+        @tester_period_in_ns = 0
+
+        update_clock_period(options)
+        update_tester_period_local
+        update_clock_parameters
       end
 
       def start_clock(options = {})
-        fail "ERROR: Clock on #{@owner.name} already running." if running?
+        # Throw error if this pin is already a running clock
+        if running?
+          fail "PIN CLOCK ERROR: Clock on #{@owner.name} already running."
+        end
 
-        if update_required?(options)
-          update_half_period(options)
+        clock_updated = update_clock_period(options)
+        tester_updated = update_tester_period_local
+        if clock_updated || tester_updated
+          update_clock_parameters
         end
 
-        @last_edge = Origen.tester.cycle_count
-        @next_edge = Origen.tester.cycle_count + @cycles_per_half_period
-        cc "Start clock on #{@owner.name}: cycles_per_half_period=#{@cycles_per_half_period}, start cycle=#{@last_edge}"
+        cc "[PinClock] Start #{@owner.name}.clock at #{Origen.tester.cycle_count}: period=#{@clock_period_in_ns}ns, cycles=#{cycles_per_period}, duty=#{duty_str}"
+        update_edges
         Origen.tester.push_running_clock(@owner) unless running?
         @running = true
       end
 
-      def restart_clock(_options = {})
+      def stop_clock(options = {})
+        cc "[PinClock] Stop #{@owner.name}.clock: stop_cycle=#{Origen.tester.cycle_count}" if running?
+        Origen.tester.pop_running_clock(@owner) if running?
+        @running = false
+      end
+
+      def restart_clock
         stop_clock
         update_clock
         start_clock
       end
 
-      def stop_clock(_options = {})
-        cc "Stop clock on #{@owner.name}: stop cycle=#{Origen.tester.cycle_count}" if running?
-        Origen.tester.pop_running_clock(@owner) if running?
-        @running = false
-      end
-
       def update_clock
-        unless update_half_period(period_in_ns: @ns_per_half_period)
-          @last_edge = Origen.tester.cycle_count
-          @next_edge = Origen.tester.cycle_count + @cycles_per_half_period
+        if update_tester_period_local
+          update_clock_parameters
+          cc "[PinClock] Update #{@owner.name}.clock at #{Origen.tester.cycle_count}: period=#{@clock_period_in_ns}ns, cycles=#{cycles_per_period}, duty=#{duty_str}"
+          update_edges
         end
       end
 
+      def running?
+        @running
+      end
+
       def toggle
         @owner.toggle
-        @last_edge = Origen.tester.cycle_count
-        @next_edge = Origen.tester.cycle_count + @cycles_per_half_period
+        update_edges
+      end
+
+      # The only caller to this should be legacy support so just force 50% duty cycle
+      def cycles_per_half_period
+        @cycles_per_duty.min
       end
 
       private
 
-      def update_half_period(options = {})
-        old_cycles_per_half_period = @cycles_per_half_period
-        options = { cycles: 0,
-                    period_in_s: 0, period_in_ms: 0, period_in_us: 0, period_in_ns: 0,
-                    frequency_in_hz: 0, frequency_in_khz: 0, frequency_in_mhz: 0,
-                    freq_in_hz: 0, freq_in_khz: 0, freq_in_mhz: 0
-                  }.merge(options)
-
-        cycles = 0
-        cycles += options[:cycles]
-        cycles += s_to_cycles(options[:period_in_s])
-        cycles += ms_to_cycles(options[:period_in_ms])
-        cycles += us_to_cycles(options[:period_in_us])
-        cycles += ns_to_cycles(options[:period_in_ns])
-        cycles += hz_to_cycles(options[:frequency_in_hz])
-        cycles += khz_to_cycles(options[:frequency_in_khz])
-        cycles += mhz_to_cycles(options[:frequency_in_mhz])
-        cycles += hz_to_cycles(options[:freq_in_hz])
-        cycles += khz_to_cycles(options[:freq_in_khz])
-        cycles += mhz_to_cycles(options[:freq_in_mhz])
-
-        @cycles_per_half_period = cycles / 2
-        @ns_per_half_period = cycles * Origen.tester.current_period_in_ns
-        @cycles_per_half_period == old_cycles_per_half_period
+      def update_clock_parameters
+        @cycles_per_duty = [(cycles_per_period / 2.0).floor, (cycles_per_period / 2.0).ceil]
       end
 
-      def s_to_cycles(time) # :nodoc:
-        ((time.to_f) * 1000 * 1000 * 1000 / Origen.tester.current_period_in_ns).to_int
+      def cycles_per_period
+        (@clock_period_in_ns / @tester_period_in_ns).to_int
       end
 
-      def ms_to_cycles(time) # :nodoc:
-        ((time.to_f) * 1000 * 1000 / Origen.tester.current_period_in_ns).to_int
+      def update_edges
+        @last_edge = Origen.tester.cycle_count
+        @next_edge = Origen.tester.cycle_count + @cycles_per_duty[0]
+        @cycles_per_duty.reverse!
       end
 
-      def us_to_cycles(time) # :nodoc:
-        ((time.to_f * 1000) / Origen.tester.current_period_in_ns).to_int
+      def update_tester_period_local
+        if Origen.tester.current_period_in_ns == @tester_period_in_ns
+          return false
+        else
+          @tester_period_in_ns = Origen.tester.current_period_in_ns
+          return true
+        end
       end
 
-      def ns_to_cycles(time) # :nodoc:
-        (time.to_f / Origen.tester.current_period_in_ns).to_int
-      end
+      def update_clock_period(options = {})
+        new = get_clock_period(options)
 
-      def hz_to_cycles(freq) # :nodoc:
-        (freq == 0) ? freq : s_to_cycles(1 / freq.to_f)
+        if new == @clock_period_in_ns
+          false
+        else
+          @clock_period_in_ns = new
+          true
+        end
       end
 
-      def khz_to_cycles(freq) # :nodoc:
-        (freq == 0) ? freq : ms_to_cycles(1 / freq.to_f)
-      end
+      def get_clock_period(options = {})
+        return @clock_period_in_ns if options.empty?
+
+        p = []
+
+        # Passed in as time
+        p << (options[:period_in_s] * 1_000_000_000) if options[:period_in_s]
+        p << (options[:period_in_ms] * 1_000_000) if options[:period_in_ms]
+        p << (options[:period_in_us] * 1_000) if options[:period_in_us]
+        p << (options[:period_in_ns] * 1) if options[:period_in_ns]
+
+        # Passed in as frequency (or freq.)
+        p << ((1.0 / options[:frequency_in_hz]) * 1_000_000_000) if options[:frequency_in_hz]
+        p << ((1.0 / options[:freq_in_hz]) * 1_000_000_000) if options[:freq_in_hz]
+        p << ((1.0 / options[:frequency_in_khz]) * 1_000_000) if options[:frequency_in_khz]
+        p << ((1.0 / options[:freq_in_khz]) * 1_000_000) if options[:freq_in_khz]
+        p << ((1.0 / options[:frequency_in_mhz]) * 1_000) if options[:frequency_in_mhz]
+        p << ((1.0 / options[:freq_in_mhz]) * 1_000) if options[:freq_in_mhz]
+
+        # Passed in as cycles (not advised)
+        p << (options[:cycles] * Origen.tester.period_in_ns) if options[:cycles]
 
-      def mhz_to_cycles(freq) # :nodoc:
-        (freq == 0) ? freq : us_to_cycles(1 / freq.to_f)
+        return @clock_period_in_ns if p.empty?
+        fail "[Pin Clock] ERROR: Multiple unit declarations for #{@owner.name}.clock" if p.size > 1
+        p[0].to_int
       end
 
-      def update_required?(options)
-        options[:cycles] ||
-          options[:period_in_s] || options[:period_in_ms] || options[:period_in_us] || options[:period_in_ns]
-        options[:frequency_in_hz] || options[:frequency_in_khz] || options[:frequency_in_mhz] ||
-          options[:freq_in_hz] || options[:freq_in_khz] || options[:freq_in_mhz]
+      def duty_str
+        "#{@cycles_per_duty[0]}/#{@cycles_per_duty[1]}"
       end
     end
   end

data/lib/origen/pins/power_pin.rb

@@ -1,6 +1,15 @@
 module Origen
   module Pins
     class PowerPin < Pin
+      attr_accessor :current_limit
+
+      def initialize(id, owner, options = {}) # :nodoc:
+        v = options[:voltage] || options[:voltages]
+        self.voltage = v if v
+        self.current_limit = options[:current_limit] if options[:current_limit]
+        super
+      end
+
       # Set the operating voltage for the pin, can be a single value or an array
       def voltage=(val)
         @voltages = [val].flatten.uniq

data/lib/origen/remote_manager.rb

@@ -18,15 +18,22 @@ module Origen
     def require!
       unless required?
         while updates_required?
+          Origen.log.info '*******************************************************************************'
           Origen.log.info 'The following remotes need to be updated, this will now happen automatically:'
           dirty_remotes.each do |name, remote|
             if remote[:path]
-              Origen.log.info "  #{name} - #{remote[:path]}"
+              Origen.log.info "  #{name} - #{remote[:path]}".green
             else
-              Origen.log.info "  #{name} - #{remote[:version]}"
+              Origen.log.info "  #{name} - #{remote[:version]}".green
             end
           end
+          Origen.log.info ''
+
           update!
+
+          Origen.log.info ''
+          Origen.log.info 'Finished updating remotes.'
+          Origen.log.info '*******************************************************************************'
         end
         @required = true
       end
@@ -289,7 +296,7 @@ module Origen
       end
     end
 
-    # Makes all dirty imports clean
+    # Makes all dirty remotes clean
     def update!
       ensure_remotes_directory
       dirty_remotes.each do |_name, remote|
@@ -305,12 +312,20 @@ module Origen
           create_symlink(remote[:path], dir)
 
         else
-          unless File.exist?("#{dir}/.initial_populate_successful")
-            ws.build(dir, rc_url: remote[:vault], allow_rebuild: true)
-            ws.switch_version(dir, remote[:version])
+          rc_url = remote[:rc_url] || remote[:vault]
+          tag = Origen::VersionString.new(remote[:version])
+          version_file = dir.to_s + '/.current_version'
+          if File.exist?("#{dir}/.initial_populate_successful")
+            FileUtils.rm_f(version_file) if File.exist?(version_file)
+            rc = RevisionControl.new remote: rc_url, local: dir
+            rc.checkout version: prefix_tag(tag), force: true
+            `echo "#{tag}" >> "#{version_file}"`
+          else
+            rc = RevisionControl.new remote: rc_url, local: dir
+            rc.checkout version: prefix_tag(tag), force: true
             `touch "#{dir}/.initial_populate_successful"`
+            `echo "#{tag}" >> "#{version_file}"`
           end
-          ws.switch_version(dir, remote[:version])
         end
       end
     end
@@ -321,8 +336,8 @@ module Origen
 
     def ensure_remotes_directory
       unless remotes.empty?
-        unless File.exist?(ws.remotes_directory)
-          FileUtils.mkdir_p(ws.remotes_directory)
+        unless File.exist?(Origen.app.remotes_dir)
+          FileUtils.mkdir_p Origen.app.remotes_dir
         end
       end
     end
@@ -330,5 +345,16 @@ module Origen
     def ws
       Origen.app.workspace_manager
     end
+
+    # If the supplied tag looks like a semantic version number, then make sure it has the
+    # 'v' prefix
+    def prefix_tag(tag)
+      tag = Origen::VersionString.new(tag)
+      if tag.semantic?
+        tag.prefixed
+      else
+        tag
+      end
+    end
   end
 end

data/lib/origen/utility/mailer.rb

@@ -136,7 +136,7 @@ The regression results are:
       end
 
       def external?(type)
-        [:production, :major, :minor, :bugfix].include?(type)
+        [:production, :major, :minor, :tiny, :bugfix].include?(type)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.45
+  version: 0.7.46
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport