origen 0.55.5 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa42e7386a88300a4c615ccbfff6fadbab0ba6a705baa0ed3125963e53badac
-  data.tar.gz: e6b18773bde78595c6f785539c425fb5ac342b45b1b5195404ce0ffc336d3724
+  metadata.gz: 4e328347b1a702ec37c86bbf6dbc0d65c9bf9376479fca31e4adc5208043f749
+  data.tar.gz: c72f5d3bbddbe4d4374450a828db82b14c3af5ea1177366e3cb62b2051037115
 SHA512:
-  metadata.gz: bc51bc8d568ab2d520e59dae431eb48bb2c9378b497d695ed95bdf97b4d19b824e95ecfbb07122dcd696b493a3fc627100f58c1e9990c6504b4804ac3a1d156e
-  data.tar.gz: fb01b860bff1024bc8fc5838012607440ffb069ae6e78757e01b6680c3600449c409f503a71730dac00eeab3d156a746e39cebf42b217f38fb9cef6bfbd8b6b2
+  metadata.gz: 441978473ed06d1df7f8ba36cd6734e5057de398846b7be6856c14e1d8a4973cc8d896958ab70dc69dccb44dea85012264006069afb50ec5406324c016841554
+  data.tar.gz: 21a81041aa01df9774cb94303e016460b070c7c9f296a5297148018c9d314a995ade0aa3432b959232bb70c524fe4249eb7912ecdf7798f273f46cfe3f493a4f

data/config/rubocop/strict_enabled.yml

@@ -240,7 +240,7 @@ Style/InfiniteLoop:
 Style/Lambda:
   Description: 'Use the new lambda literal syntax for single-line blocks.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#lambda-multi-line'
-  Enabled: true
+  Enabled: false
 
 Style/LambdaCall:
   Description: 'Use lambda.call(...) instead of lambda.(...).'

data/config/version.rb

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

data/lib/origen.rb

@@ -610,6 +610,9 @@ unless defined? RGen::ORIGENTRANSITION
         else
           @interface.reset_globals if @interface.respond_to?(:reset_globals)
         end
+        if @interface.respond_to?(:on_interface_reset)
+          @interface.on_interface_reset
+        end
         @interface
       end
 

data/lib/origen/application/lsf_manager.rb

@@ -252,8 +252,9 @@ module Origen
       end
 
       # Build the log file from the completed jobs
-      def build_log(_options = {})
-        Origen.log.info '*' * 70
+      def build_log(options = {})
+        log_method = options[:log_file] ? options[:log_file] : :info
+        Origen.log.send(log_method, '*' * 70)
         completed_jobs.each do |job|
           File.open(log_file(job[:id])) do |f|
             last_line_blank = false
@@ -291,12 +292,12 @@ module Origen
                   stats.failed_files += Regexp.last_match[1].to_i
                 elsif line =~ /ERROR!/
                   stats.errors += 1
-                  Origen.log.send :relog, line
+                  Origen.log.send :relog, line, options
                 else
                   # Compress multiple blank lines
                   if line =~ /^\s*$/ || line =~ /.*\|\|\s*$/
                     unless last_line_blank
-                      Origen.log.info
+                      Origen.log.send(log_method, nil)
                       last_line_blank = true
                     end
                   else
@@ -305,8 +306,7 @@ module Origen
                            line =~ /Insecure world writable dir/ ||
                            line =~ /To save all of/
                       line.strip!
-                      # line.sub!(/.*\|\| /, '')
-                      Origen.log.send :relog, line
+                      Origen.log.send :relog, line, options
                       last_line_blank = false
                     end
                   end
@@ -319,7 +319,7 @@ module Origen
             end
           end
         end
-        Origen.log.info '*' * 70
+        Origen.log.send(log_method, '*' * 70)
         stats.print_summary
       end
 
@@ -409,7 +409,7 @@ module Origen
         end
 
         str = "#{action} #{cmd}".strip
-        str.sub('origen ', '') if str =~ /^origen /
+        str.sub!('origen ', '') if str =~ /^origen /
 
         # Append the --exec_remote switch to all Origen commands, this allows command
         # processing to be altered based on whether it is running locally or

data/lib/origen/application/workspace_manager.rb

@@ -114,7 +114,7 @@ module Origen
           fail "Sorry but #{path} already exists!"
         end
         FileUtils.rm_rf(path.to_s) if File.exist?(path.to_s)
-        rc = RevisionControl.new remote: options[:rc_url], local: path.to_s
+        rc = RevisionControl.new options.merge(remote: options[:rc_url], local: path.to_s)
         rc.build
       end
 

data/lib/origen/core_ext/numeric.rb

@@ -54,27 +54,27 @@ class Numeric
   end
 
   def as_units(units)
-    if self >= 1_000_000_000_000_000
+    if abs >= 1_000_000_000_000_000
       "#{self / 1_000_000_000_000_000.0}P#{units}"
-    elsif self >= 1_000_000_000_000
+    elsif abs >= 1_000_000_000_000
       "#{self / 1_000_000_000_000.0}T#{units}"
-    elsif self >= 1_000_000_000
+    elsif abs >= 1_000_000_000
       "#{self / 1_000_000_000.0}G#{units}"
-    elsif self >= 1_000_000
+    elsif abs >= 1_000_000
       "#{self / 1_000_000.0}M#{units}"
-    elsif self >= 1_000
+    elsif abs >= 1_000
       "#{self / 1_000.0}k#{units}"
-    elsif self >= 1
+    elsif abs >= 1
       "#{self}#{units}"
-    elsif self >= 1e-3
+    elsif abs >= 1e-3
       "#{self * 1_000}m#{units}"
-    elsif self >= 1e-6
+    elsif abs >= 1e-6
       "#{self * 1_000_000}u#{units}"
-    elsif self >= 1e-9
+    elsif abs >= 1e-9
       "#{self * 1_000_000_000}n#{units}"
-    elsif self >= 1e-12
+    elsif abs >= 1e-12
       "#{self * 1_000_000_000_000}p#{units}"
-    elsif self >= 1e-15
+    elsif abs >= 1e-15
       "#{self * 1_000_000_000_000_000}a#{units}"
     else
       "%.3e#{units}" % self

data/lib/origen/generator/pattern.rb

@@ -91,9 +91,23 @@ module Origen
         # end
 
         @pattern_sequence = true
-        pattern_wrapper([], [], options) do
+
+        # The startup callbacks need to be skipped for now until the main thread is open for business
+        pattern_wrapper([], [], options.merge(call_startup_callbacks: false)) do
+          # The startup callbacks, if required, need to be wrapped up in a closure for calling
+          # later by the main thread
+          if (options.key?(:call_startup_callbacks) && !options[:call_startup_callbacks]) || options[:skip_startup]
+            pre_block = nil
+          else
+            pre_block = proc do
+              # Call startup callbacks
+              Origen.app.listeners_for(:startup).each do |listener|
+                listener.startup(options)
+              end
+            end
+          end
           PatternSequencer.send(:active=, true)
-          @pattern_sequence = PatternSequence.new(job.output_pattern_filename, block)
+          @pattern_sequence = PatternSequence.new(job.output_pattern_filename, block, pre_block)
           @pattern_sequence.send(:execute)
           PatternSequencer.send(:active=, false)
         end

data/lib/origen/generator/pattern_sequence.rb

@@ -5,15 +5,17 @@ module Origen
     # Manages a single pattern sequence, i.e. an instance of PatternSequence is
     # created for every Pattern.sequence do ... end block
     class PatternSequence
-      def initialize(name, block)
+      def initialize(name, block, pre_block = nil)
         @number_of_threads = 1
         @name = name
         @running_thread_ids = { main: true }
         # The contents of the main Pattern.sequence block will be executed as a thread and treated
         # like any other parallel block
-        thread = PatternThread.new(:main, self, block, true)
+        thread = PatternThread.new(:main, self, block, true, pre_block)
         threads << thread
         active_threads << thread
+        PatSeq.send(:current_sequence=, self)
+        @sync_ups = {}
       end
 
       # Execute the given pattern
@@ -45,7 +47,7 @@ module Origen
       end
       alias_method :in_parallel, :thread
 
-      def wait_for_threads(*ids)
+      def wait_for_threads_to_complete(*ids)
         completed = false
         blocked = false
         ids = ids.map(&:to_sym)
@@ -71,10 +73,48 @@ module Origen
           end
         end
       end
-      alias_method :wait_for_thread, :wait_for_threads
+      alias_method :wait_for_thread, :wait_for_threads_to_complete
+      alias_method :wait_for_threads, :wait_for_threads_to_complete
+      alias_method :wait_for_thread_to_complete, :wait_for_threads_to_complete
 
       private
 
+      def sync_up(location, *ids)
+        options = ids.pop if ids.last.is_a?(Hash)
+        options ||= {}
+        ids = ids.map(&:to_sym)
+        if ids.empty? || ids.include?(:all)
+          ids = @running_thread_ids.keys
+          ids.delete(:main) unless options[:include_main]
+        end
+        # Just continue if this thread is not in the list
+        return unless ids.include?(current_thread.id)
+        # If we have entered the same sync up point after having previously completed it,
+        # then clear it and start again
+        if @sync_ups[location] && @sync_ups[location][:completed]
+          @sync_ups[location] = nil
+        end
+        # Don't need to worry about race conditions here as Origen only allows 1 thread
+        # to be active at a time
+        if @sync_ups[location]
+          @sync_ups[location][:arrived] << current_thread.id
+        else
+          @sync_ups[location] = { required: Set.new, arrived: Set.new, completed: false }
+          ids.each { |id| @sync_ups[location][:required] << id }
+          @sync_ups[location][:arrived] << current_thread.id
+        end
+        if @sync_ups[location][:required] == @sync_ups[location][:arrived]
+          @sync_ups[location][:completed] = true
+        end
+        blocked = false
+        until @sync_ups[location][:completed]
+          current_thread.waiting_for_thread(blocked)
+          blocked = true
+          Origen.log.debug "Waiting for sync_up: #{@sync_ups}"
+        end
+        current_thread.record_active if blocked
+      end
+
       def thread_running?(id)
         @running_thread_ids[id]
       end
@@ -86,7 +126,11 @@ module Origen
       def log_execution_profile
         if threads.size > 1
           thread_id_size = threads.map { |t| t.id.to_s.size }.max
-          line_size = IO.console.winsize[1] - 35 - thread_id_size
+          begin
+            line_size = IO.console.winsize[1] - 35 - thread_id_size
+          rescue
+            line_size = 150
+          end
           line_size -= 16 if tester.try(:sim?)
           cycles_per_tick = (@cycle_count_stop / (line_size * 1.0)).ceil
           if tester.try(:sim?)

data/lib/origen/generator/pattern_sequencer.rb

@@ -81,8 +81,27 @@ module Origen
           str
         end
 
+        # Wait for the given threads to complete. If no IDs given it will wait for all currently running
+        # threads (except for the one who called this) to complete.
+        def wait_for_threads_to_complete(*ids)
+          @current_sequence.wait_for_threads_to_complete(*ids)
+        end
+        alias_method :wait_for_thread, :wait_for_threads_to_complete
+        alias_method :wait_for_threads, :wait_for_threads_to_complete
+        alias_method :wait_for_thread_to_complete, :wait_for_threads_to_complete
+
+        def sync_up(*ids)
+          if @current_sequence
+            @current_sequence.send(:sync_up, caller[0], *ids)
+          end
+        end
+
         private
 
+        def current_sequence=(seq)
+          @current_sequence = seq
+        end
+
         def active=(val)
           @active = val
         end

data/lib/origen/generator/pattern_thread.rb

@@ -14,7 +14,7 @@ module Origen
       # A record of when the thread is active to construct the execution profile
       attr_reader :events
 
-      def initialize(id, sequence, block, primary = false)
+      def initialize(id, sequence, block, primary = false, pre_block = nil)
         if primary
           @cycle_count_start = 0
         else
@@ -24,6 +24,7 @@ module Origen
         @id = id.to_sym
         @sequence = sequence
         @block = block
+        @pre_block = pre_block
         @primary = primary
         @running = Concurrent::Event.new
         @waiting = Concurrent::Event.new
@@ -46,6 +47,7 @@ module Origen
         @thread = Thread.new do
           PatSeq.send(:thread=, self)
           wait
+          @pre_block.call if @pre_block
           @block.call(sequence)
           sequence.send(:thread_completed, self)
           record_cycle_count_stop

data/lib/origen/log.rb

@@ -274,6 +274,7 @@ module Origen
       else
         msg = format_msg(method.to_s.upcase, msg)
       end
+      console.info msg if options[:verbose]
       @custom_logs[method.to_sym].info(msg)
     end
 
@@ -364,8 +365,10 @@ module Origen
       end
     end
 
-    def relog(msg)
-      if msg =~ /^\[(\w+)\] .*/
+    def relog(msg, options = {})
+      if options[:log_file]
+        send options[:log_file], msg.sub(/.*\|\|\s*/, ''), options
+      elsif msg =~ /^\[(\w+)\] .*/
         method = Regexp.last_match(1).downcase
         if respond_to?(method)
           send method, msg.sub(/.*\|\|\s*/, '')

data/lib/origen/pins/pin.rb

@@ -443,6 +443,24 @@ module Origen
       end
       alias_method :add_locn, :add_location
 
+      # Add a way to update packages for the pins after the pins have been added.
+      #
+      # @example Updating a package after the pin has been added
+      # dut.add_pin :p1
+      # dut.add_package: package1
+      # dut.add_package: package2
+      # dut.pin(:p1).packages # => {}
+      # dut.pin(:p1).update_packages :packages # => [:package1, :package2]
+      # dut.pin(:p1).packages # => {:package1=>{}, :package2=>{}}
+      def update_packages(options = {})
+        packages = resolve_packages(options)
+        packages.each do |package_id|
+          package_id = package_id.respond_to?(:id) ? package_id.id : package_id
+          myself.packages[package_id] ||= {}
+        end
+      end
+      alias_method :update_package, :update_packages
+
       # Add a Device Interface Board (e.g. probecard at wafer probe or loadboard at final package test)
       # assignment to the pin.  Some refer to this as a channel but API name is meant to be generic.
       def add_dib_assignment(str, options = {})

data/lib/origen/regression_manager.rb

@@ -27,6 +27,7 @@ module Origen
     # @param [Hash] options Options to customize the run instance
     # @option options [Array]   :target String Array of target names on which to run regression
     # @option options [Boolean] :build_reference (true) Build reference workspace automatically
+    # @option options [Symbol]  :build_method (:init) whether to use a git init or git clone method to build the workspace
     # @option options [Boolean] :send_email (false) Send results email when regression complete
     # @option options [Boolean] :email_all_developers (false) If sending email, whether to email all developers or just user
     # @option options [Boolean] :report_results (false) Whether to report results inline to console
@@ -35,6 +36,7 @@ module Origen
     def run(options = {})
       options = {
         build_reference:      true,
+        build_method:         :init,
         send_email:           false,
         email_all_developers: false,
         report_results:       false,
@@ -46,7 +48,7 @@ module Origen
         Origen.lsf.clear_all
         yield options
         wait_for_completion(options) if options[:uses_lsf]
-        save_and_delete_output
+        save_and_delete_output(options)
       else
         if options[:build_reference]
           @reference_tag = version_to_tag(options[:version] || get_version(options))
@@ -58,7 +60,8 @@ module Origen
             disable_origen_version_check do
               Dir.chdir reference_origen_root do
                 Bundler.with_clean_env do
-                  system 'rm -rf lbin'
+                  # Origen 0.40.0 started using origen-owned binstubs
+                  system 'rm -rf lbin' if Gem::Version.new(Origen.version) < Gem::Version.new('0.40.0')
                   # If regression is run using a service account, we need to setup the path/bundler manually
                   # The regression manager needs to be passed a --service_account option when initiated.
                   if options[:service_account]
@@ -125,7 +128,7 @@ module Origen
     end
 
     def summarize_results(options = {})
-      Origen.lsf.build_log
+      Origen.lsf.build_log(options)
       stats = Origen.app.stats
       if options[:report_results]
         puts "Regression results: \n"
@@ -144,12 +147,16 @@ module Origen
 
     # Saves all generated output (to the reference dir) and then
     # deletes the output directory to save space
-    def save_and_delete_output
-      Origen.lsf.build_log
+    def save_and_delete_output(options = {})
+      Origen.lsf.build_log(options)
       Origen.log.flush
       Dir.chdir reference_origen_root do
         Bundler.with_clean_env do
-          system 'bundle exec origen save all'
+          if options[:log_file]
+            system "bundle exec origen save all -f log/#{options[:log_file]}.txt"
+          else
+            system 'bundle exec origen save all'
+          end
         end
       end
       FileUtils.rm_rf "#{reference_origen_root}/output"
@@ -214,7 +221,7 @@ module Origen
           # Build the new reference workspace now.
           unless File.exist?(@reference_workspace)
             highlight { Origen.log.info 'Building reference workspace...' }
-            ws.build(@reference_workspace)
+            ws.build(@reference_workspace, options)
           end
           ws.set_reference_workspace(@reference_workspace)
         else
@@ -229,7 +236,7 @@ module Origen
         end
         unless File.exist?(@reference_workspace)
           highlight { Origen.log.info 'Building reference workspace...' }
-          ws.build(@reference_workspace)
+          ws.build(@reference_workspace, options)
         end
         ws.set_reference_workspace(@reference_workspace)
       end

data/lib/origen/revision_control/git.rb

@@ -345,6 +345,7 @@ module Origen
       end
 
       def initialize_local_dir(options = {})
+        return if options[:build_method] == :clone
         super
         unless initialized?(options)
           Origen.log.debug "Initializing Git workspace at #{local}"

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,7 +8,7 @@ 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-05-08"
+  s.date = "2020-09-01"
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.55.5
+  version: 0.58.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport