origen 0.59.1 → 0.59.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be12bb5b800939408adf130a00a28b7f18231ad8ff4c4d85faf1d84e5a010269
-  data.tar.gz: d109bc8ff310e00c4a95408845bfcb376f2685471407dd7acb146c7ed0f0718b
+  metadata.gz: 7e2a028ce1b3b3fe724cb3c9cec676ed6830a40fa7ec74864a0dd3bd50611260
+  data.tar.gz: 8fe8e6c101236617832f6db76f807c346e2d41b6f3872ae33b5c1cd3de602914
 SHA512:
-  metadata.gz: 4cae4addf34171310be4685c8fada1529be19dafcd19db00e8c51211026e34f7490c476d484136cfaeac40d962d06f4de9877b4ffdc5aa3d7b2f89ac4f8115f7
-  data.tar.gz: 0a13bd267944d0aa0f8a79bb6b1b48c3f570269cf204a48e7507d9e4557bae7e98869847fd1b4787d0a55137228bf60ea68960dc2fad13488bb835f09b414d81
+  metadata.gz: cca720d7a1c5d40101d6c4bd2b5ec598993026c3980d1a814cbe86db25c6f973d1549f1ea9a58eba026e2b06aadbd687a20753ffa3ca8bcdfded6cc310e0283a
+  data.tar.gz: 1ce140605160e77ab74aca9fbd40be126cf18e07f8e74a2826a4f63289f61b57ab0200e3180d9c034b250527351a6c5b6d81bba94fc15fdbd89c0f313fe7d7b5

data/config/version.rb

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

data/lib/origen/controller.rb

@@ -2,6 +2,18 @@ module Origen
   module Controller
     extend ActiveSupport::Concern
 
+    # Workaround due to reserved keywords in Ruby, Display in the case below.
+    def display
+      # If the DUT responds to a sub_block "display" return the sub_block
+      if model.sub_blocks.include? 'display'
+        Origen.log.debug "Found a sub_block \'display\', passing control to the #{model.class}..."
+        model.sub_blocks['display']
+      else
+        # Else, pass control to the ruby core.
+        super
+      end
+    end
+
     module ClassMethods
       def model(options = {})
         options[:controller_class] = self

data/lib/origen/generator/pattern_sequence.rb

@@ -132,6 +132,13 @@ module Origen
             line_size = 150
           end
           line_size -= 16 if tester.try(:sim?)
+          # This should only occur when $tester.handshake has been called on the V93K or a similar API
+          # which splits a pattern up until multiple outputs.
+          # This is a quick patch to skip rendering an execution profile for pattern parts 1 to n, instead
+          # of crashing.
+          # It should be possible to get an execution profile in these cases if someone were to invest the
+          # time in it to workout why this variable is not set upstream in these cases.
+          return unless @cycle_count_stop
           cycles_per_tick = (@cycle_count_stop / (line_size * 1.0)).ceil
           if tester.try(:sim?)
             execution_time = tester.execution_time_in_ns / 1_000_000_000.0
@@ -193,7 +200,7 @@ module Origen
         elsif time < 1.s
           "%.#{number_decimal_places}fms" % (time * 1_000)
         else
-          "%.#{number_decimal_places}fs" % tick_time
+          "%.#{number_decimal_places}fs" % time
         end
       end
 

data/lib/origen/pins/pin.rb

@@ -22,8 +22,8 @@ module Origen
       # before falling back to a default
       PACKAGE_SCOPED_ATTRIBUTES = [:location, :dib_assignment, :dib_meta]
 
-      # Pin Types
-      TYPES = [:analog, :digital]
+      # Pin Types, 'digital' and 'analog' are legacy types kept for backwards compatibility
+      TYPES = [:analog, :digital, :signal, :ground, :power, :virtual]
 
       attr_accessor :order
       # Inverts pin states for drive and compare, can be useful if a timing set change requires clocks to drive low for example when all pattern logic has been set up to drive them high.

data/lib/origen/registers/reg.rb

@@ -574,6 +574,16 @@ module Origen
         }.merge(options)
         result = []
 
+        # Shows the bits that have changed from the reset value of the register/bits.
+        # Currently logs it to the console window using Origen logger.
+        def changed_bits(options = {})
+          temp = named_bits.select { |name, bits| bits.data != bits.reset_val }
+          temp.each do |r|
+            Origen.log.info "\t\t#{self.name}.#{r[0]} : #{r[1].value.to_hex}".bold.blue
+          end
+          Origen.log.info '  '
+        end
+
         # test if @lookup has any values stored as an array
         # if so it means there is a split group of bits
         # process that differently to a single bit or continuous range of bits

data/lib/origen/site_config.rb

@@ -416,9 +416,10 @@ module Origen
       # Load any centralized site configs now.
       centralized_site_config = find_val('centralized_site_config')
       if centralized_site_config
-        # We know the last two site configs will exists (they are in Origen core) and that they contain the default
-        # values. We want the centralized config to load right after those.
-        @configs.insert(-3, Config.new(path: centralized_site_config, parent: self))
+        # The first site configs found will exist in Origen core, and they contain the default values.
+        # We want the centralized config to load right after those.
+        centralized_index = -(@configs.select { |c| c.path.start_with?(Origen.top.to_s) }.size + 1)
+        @configs.insert(centralized_index, Config.new(path: centralized_site_config, parent: self))
       end
 
       # After all configs have been populated, see if the centralized needs refreshing

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2020-09-01"
+  s.date = "2020-12-08"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.0.3" if s.respond_to? :installed_by_version
+  s.installed_by_version = "3.0.1" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/spec/format/origen_formatter.rb

@@ -1,7 +1,8 @@
 require 'rspec/core/formatters/base_formatter'
 
 class OrigenFormatter < RSpec::Core::Formatters::BaseFormatter
-  if Gem::Version.new(RSpec::Version::STRING) < Gem::Version.new('3.0.0')
+  rspec_version = RSpec.constants.include?(:Version) ? RSpec::Version::STRING : RSpec::Core::Version::STRING 
+  if Gem::Version.new(rspec_version) < Gem::Version.new('3.0.0')
     # legacy formatter
     def dump_summary(duration, example_count, failure_count, pending_count)
       if failure_count > 0

data/templates/code_generators/model.rb

@@ -15,7 +15,15 @@ class <%= @namespaces.map { |n| camelcase(n[1]) }.join('::') %>::<%= camelcase(@
   include Origen::Model
 <% end -%>
 
-<% end -%>
   def initialize(options = {})
   end
+<% else -%>
+# super means that the initialize request will get passed onto the parent class's initialize method. 
+# i.e. the one defined in <%= @parent_class %>
+# If you want to override that and add a specific implementation for this DUT type,
+# then simply delete the super below and add the code you wish to handle the request.
+  def initialize(options = {})
+    super
+  end
+<% end -%>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.59.1
+  version: 0.59.6
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -749,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit