origen 0.59.3 → 0.59.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1fc57782e99a1d16b12376e79e535f2722bd98f82f31e2598a7c0c8a5bc26bb
-  data.tar.gz: 7547030f36db02db638794320c4b1679eef86b06de2471df0dc5164dc23b1498
+  metadata.gz: 105c715afc0bf9d3fb0133656e2bb9b5072598bee921a83e47ed0974ce75de4c
+  data.tar.gz: e00626fb9e1f477af6884417a9fcc7605ee7a869d4e5cba56c2f456085c93bc1
 SHA512:
-  metadata.gz: a71ca51af97b345415c8038ed8aa62eaa76c2a2fbc5a10d0c50e4d9185a0aaebb30882a8069b4d80ab42782c48a187b803ce9c8a702854eab9bfbf61e895f02f
-  data.tar.gz: 0fcfa708b056221e6fb34e1fe45a1f2cb1aae71858dd80c4ff5a2627c24ed6bae128d7fbca3049501cd64f3818b73890e0d86edf25e8b510e4d25067bedd0ba7
+  metadata.gz: a30e6be68bfe2ccbea6159919c285683a3a996c3b82591e748a37f96407e6aed34bc7500a7b0d2c1593ecfa0b55c08d51490334cc3da5cc5e7946a5ca2350dd3
+  data.tar.gz: 01cb78307b372f25c1365ff25270772c2ec6eabe7507167a91c6961b2fb49bb306a6c4277985f45d873d4384326090f4d7945fefcef00770ec8e29fb197dc31d

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 59
-  BUGFIX = 3
+  BUGFIX = 8
   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/compiler.rb

@@ -103,7 +103,11 @@ module Origen
         # not be an issue except when testing Origen and generating and compiling within
         # the same thread, but clearing this here doesn't seem to do any harm.
         Origen.file_handler.default_extension = nil
-        Origen.log.info "Compiling... #{relative_path_to(file)}" unless options[:quiet]
+        begin
+          Origen.log.info "Compiling... #{relative_path_to(file)}" unless options[:quiet]
+        rescue
+          Origen.log.info "Compiling... #{file}" unless options[:quiet]
+        end
         Origen.log.info "  Created... #{relative_path_to(output_file(file, options))}" unless options[:quiet]
         stats.completed_files += 1 if options[:collect_stats]
         if is_erb?(file)

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?(File.expand_path('../../../')) }.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/lib/origen/sub_blocks.rb

@@ -501,8 +501,8 @@ module Origen
             rescue NameError => e
               raise if e.message !~ /^uninitialized constant (.*)$/ || tmp_class !~ /#{Regexp.last_match(1)}/
               begin
-                tmp_class = class_name.to_s
-                klass = eval(class_name)
+                tmp_class = "::#{class_name}"
+                klass = eval(tmp_class)
               rescue NameError => e
                 raise if e.message !~ /^uninitialized constant (.*)$/ || tmp_class !~ /#{Regexp.last_match(1)}/
                 begin

data/origen_app_generators/Gemfile.lock

@@ -1,54 +1,53 @@
 PATH
   remote: .
   specs:
-    origen_app_generators (2.1.1)
+    origen_app_generators (2.2.0)
       origen (>= 0.40.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.4.0)
+    ast (2.4.1)
     astrolabe (1.3.1)
       parser (~> 2.2)
     byebug (9.0.6)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colored (1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.7)
     cri (2.10.1)
       colored (~> 1.2)
     dentaku (2.0.11)
-    diff-lcs (1.3)
-    docile (1.3.1)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
     gems (0.8.3)
     highline (1.7.10)
-    httparty (0.17.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
     kramdown (1.17.0)
-    method_source (0.9.2)
-    mime-types (3.2.2)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.1104)
     mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    minitest (5.14.2)
     multi_xml (0.6.0)
     nanoc (3.7.5)
       cri (~> 2.3)
-    net-ldap (0.16.1)
+    net-ldap (0.17.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    origen (0.52.0)
+    origen (0.59.4)
       activesupport (~> 4.1)
-      bundler (~> 1.7)
+      bundler (> 1.7)
       coderay (~> 1.1)
       colored (~> 1.2)
       colorize (~> 0.8.1)
@@ -68,33 +67,34 @@ GEM
       rspec-legacy_formatters (~> 1)
       rubocop (= 0.30)
       scrub_rb (~> 1.0)
-      simplecov (~> 0.9)
+      simplecov (~> 0.17)
+      simplecov-html (~> 0.10)
       thor (~> 0.19)
       yard (~> 0.8)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    powerpack (0.1.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (2.2.2)
       rake
     rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-legacy_formatters (1.0.1)
+      rspec-support (~> 3.10.0)
+    rspec-legacy_formatters (1.0.2)
       rspec (~> 3.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     rubocop (0.30.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
@@ -103,16 +103,17 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.10.1)
     scrub_rb (1.0.1)
-    simplecov (0.16.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    yard (0.9.19)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -123,4 +124,4 @@ DEPENDENCIES
   origen_app_generators!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/origen_app_generators/config/version.rb

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

data/origen_app_generators/doc/history

@@ -1,3 +1,14 @@
+<a class="anchor release_tag" name="v2_2_0"></a>
+<h1><a href="#v2_2_0">Tag: v2.2.0</a></h1>
+
+##### Branch: 'master'
+
+##### by Caquelin, Brian on 03-Dec-2020 08:40AM
+
+
+* Removed older Ruby dependencies
+* Added Github Actions regression testing
+
 <a class="anchor release_tag" name="v2_1_1"></a>
 <h1><a href="#v2_1_1">Tag: v2.1.1</a></h1>
 

data/origen_app_generators/origen_app_generators.gemspec

@@ -1,32 +1,30 @@
 # -*- encoding: utf-8 -*-
-# stub: origen_app_generators 2.1.1 ruby lib
+# stub: origen_app_generators 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "origen_app_generators".freeze
-  s.version = "2.1.1"
+  s.version = "2.2.0"
 
   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-10-08"
+  s.date = "2021-01-11"
   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.1.4".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.1.4" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<origen>.freeze, [">= 0.40.2"])
-    else
-      s.add_dependency(%q<origen>.freeze, [">= 0.40.2"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<origen>.freeze, [">= 0.40.2"])
   else
     s.add_dependency(%q<origen>.freeze, [">= 0.40.2"])
   end

data/origen_app_generators/templates/app_generators/application/Gemfile

@@ -8,6 +8,8 @@ source 'https://rubygems.org'
 
 gem 'origen', '>= <%= @latest_origen_version %>'
 
+gem 'byebug'
+
 gem 'origen_doc_helpers'
 <% if @development_dependencies -%>  
   <% @development_dependencies.each do |dep| -%>
@@ -15,14 +17,6 @@ gem <%= dep.map{ |d| "\"#{d}\"" }.join(', ') %>
   <% end -%>
 <% end -%>
 
-gem 'byebug', '~>8'  # You can remove this version constraint if you don't care about your app
-                     # supporting earlier versions of Ruby 2
-<% if RUBY_VERSION < "2.3.0" -%>
-
-# Lock this version of nokogiri to enable compatibility with Ruby 2.2, if you don't need
-# that then you can remove this line
-gem 'nokogiri', '1.8.5'
-<% end -%>
 <% if (@audience != :external) && Origen.site_config.gem_push_plugins -%>
 <%   Origen.site_config.gem_push_plugins.each do |plugin| -%>
 gem <%= Array(plugin).map{ |d| "\"#{d}\"" }.join(', ') %>

data/origen_app_generators/templates/app_generators/plugin/Gemfile

@@ -13,8 +13,8 @@ source 'https://rubygems.org'
 # your application's test coverage
 gem 'coveralls', require: false
 <% end -%>
-gem 'byebug', '~>8'  # You can remove this version constraint if you don't care about your app
-                     # supporting earlier versions of Ruby 2
+
+gem 'byebug'
 gem 'ripper-tags'
 gem 'origen_doc_helpers'
 <% if (@audience != :external) && Origen.site_config.gem_push_plugins -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.59.3
+  version: 0.59.8
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-01-28 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.1.4
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit