origen_testers 0.52.15 → 0.54.0

data/lib/origen_testers/pattern_compilers/v93k.rb

@@ -54,20 +54,18 @@ module OrigenTesters
           avc_dir:       nil,
           binl_dir:      nil,
           multiport:     nil,        # Optional hash for multiport settings: port_bursts, port_in_focus, prefix, postfix
-          digcap:        nil,        # Optional hash for digcap settings: pins, vps, nrf, char
+          digcap:        nil        # Optional hash for digcap settings: pins, vps, nrf, char
         }.merge(@user_options)
 
         @job_options = {
           tester:   :v93k,
-          compiler: self.class.compiler,   # required
+          compiler: self.class.compiler   # required
         }.merge(@job_options)
 
-        @compiler_options = {
-
-        }.merge(@compiler_options)
+        @compiler_options = {}.merge(@compiler_options)
 
         @compiler_options_with_args = {
-          aiv2b_opts:  nil
+          aiv2b_opts: nil
         }.merge(@compiler_options_with_args)
 
         @avc_files = []
@@ -149,6 +147,7 @@ module OrigenTesters
           # Assumes .aiv file and all workspace collateral has been built up
           aiv = convert_to_pathname(aiv)
           fail 'File does not exist!  Please specify existing aiv file.' unless aiv.file?
+
           current_job_options = @job_options.merge(@compiler_options_with_args)
           current_job_options = current_job_options.merge(extract_job_options_from_aiv(aiv))
           current_job_options = current_job_options.merge(options)
@@ -163,6 +162,7 @@ module OrigenTesters
       # Output the compiler jobs in the queue to the console
       def inspect_jobs(index = nil)
         return empty_msg if empty?
+
         desc = []
         puts "\n"
         @jobs.each_with_index do |j, i|
@@ -195,8 +195,10 @@ module OrigenTesters
         # First-level verification: file/directory was given and exists
         msg = 'Pass in a valid file (.avc, .avc.gz, .list) or a valid directory'
         fail "Pattern path is set to nil! #{msg}" if p.nil?
+
         path = Pathname.new(p)
         fail "Pattern path does not exist! #{msg}" unless path.exist?
+
         path = path.expand_path
 
         # Set the reference directory for pattern sub-dir mirroring
@@ -257,7 +259,7 @@ module OrigenTesters
 
           # Move AVC files into job space (through pre-processor)
           @files.each do |file|
-            contents = File.open(file, 'rb') { |f| f.read }
+            contents = File.open(file, 'rb', &:read)
             new_contents = preprocess_avc(contents)
             new_avc_file = Pathname.new("#{job_avc_dir}/#{Pathname.new(file).basename}").cleanpath
             File.open(new_avc_file, 'w') { |f| f.write(new_contents.force_encoding('UTF-8')) }
@@ -315,6 +317,7 @@ module OrigenTesters
         factor = 1
         contents.each_line do |line|
           next if line.match(/^\s*\#/)
+
           if line.match(/^\s*SQPG\s+LBGN\s+(\d+)\s*;/)
             factor = Regexp.last_match(1).to_i
           end
@@ -325,42 +328,36 @@ module OrigenTesters
       end
 
       def avc_dir
-        @avc_dir ||= begin
-          if @user_options[:avc_dir]
-            clean_path(@user_options[:avc_dir].to_s)
-          else
-            Pathname.new('./AVC')      # default value
-          end
-        end
+        @avc_dir ||= if @user_options[:avc_dir]
+                       clean_path(@user_options[:avc_dir].to_s)
+                     else
+                       Pathname.new('./AVC')      # default value
+                     end
       end
 
       def binl_dir
-        @binl_dir ||= begin
-          if @user_options[:binl_dir]
-            clean_path(@user_options[:binl_dir].to_s)
-          else
-            Pathname.new('./BINL')     # default value
-          end
-        end
+        @binl_dir ||= if @user_options[:binl_dir]
+                        clean_path(@user_options[:binl_dir].to_s)
+                      else
+                        Pathname.new('./BINL')     # default value
+                      end
       end
 
       def tmp_dir
-        @tmp_dir ||= begin
-          if @user_options[:tmp_dir]
-            clean_path(@user_options[:tmp_dir].to_s)
-          else
-            Pathname.new('./tmp')     # default value
-          end
-        end
+        @tmp_dir ||= if @user_options[:tmp_dir]
+                       clean_path(@user_options[:tmp_dir].to_s)
+                     else
+                       Pathname.new('./tmp')     # default value
+                     end
       end
 
       # Given path string, return Pathname object with cleaned up path
       def clean_path(path_str)
         path = Pathname.new(path_str).cleanpath
         if path.absolute?
-          return path
+          path
         else
-          return Pathname.new("./#{path}")
+          Pathname.new("./#{path}")
         end
       end
 
@@ -408,7 +405,7 @@ module OrigenTesters
 
       def extract_job_options_from_aiv(file)
         options = {}
-        contents = File.open(file, 'rb') { |f| f.read }
+        contents = File.open(file, 'rb', &:read)
         count = 0
         counting = false
         contents.each_line do |line|

data/lib/origen_testers/pattern_compilers.rb

@@ -104,6 +104,7 @@ module OrigenTesters
       if p.nil?
         fail "No tester platform defined, supply one of the following as an argument: #{PLATFORMS.keys.sort.join(', ')}"
       end
+
       p = p.to_sym
       @pattern_compilers[p].keys
     end

data/lib/origen_testers/program_generators.rb

@@ -1,4 +1,10 @@
 require 'active_support/concern'
+# Ensure the OrigenTesters namespace and its autoloads (Interface, J750, V93K,
+# etc.) are registered. This file can be loaded directly (e.g. when a plugin
+# interface does `include OrigenTesters::ProgramGenerators` before origen_testers
+# has been fully required), in which case `include Interface` / the PLATFORMS
+# constants below would otherwise raise an uninitialized-constant error.
+require 'origen_testers'
 module OrigenTesters
   # Include this module to create an interface that supports multiple tester
   # types.

data/lib/origen_testers/smartest_based_tester/base/flow.rb

@@ -33,7 +33,15 @@ module OrigenTesters
           tester.smt8?
         end
 
-        def var_filename
+        def qualified_name
+          @qualified_name ||= if parent
+                                "#{parent.qualified_name}.#{name}"
+                              else
+                                name.to_s
+                              end
+        end
+
+        def var_filename # rubocop:disable Lint/DuplicateMethods
           @var_filename || 'global'
         end
 
@@ -41,24 +49,22 @@ module OrigenTesters
           @var_filename = new_var_filename
         end
 
-        def subdirectory
-          @subdirectory ||= begin
-            if smt8?
-              parents = []
-              f = parent
-              while f
-                parents.unshift(File.basename(f.filename, '.*').to_s.downcase)
-                f = f.parent
-              end
-              if Origen.interface.respond_to?(:insertion) && tester.insertion_in_the_flow_path
-                File.join tester.package_namespace, Origen.interface.insertion.to_s, 'flows', *parents
-              else
-                File.join tester.package_namespace, 'flows', *parents
-              end
-            else
-              'testflow/mfh.testflow.group'
-            end
-          end
+        def subdirectory # rubocop:disable Lint/DuplicateMethods
+          @subdirectory ||= if smt8?
+                              parents = []
+                              f = parent
+                              while f
+                                parents.unshift(File.basename(f.filename, '.*').to_s.downcase)
+                                f = f.parent
+                              end
+                              if Origen.interface.respond_to?(:insertion) && tester.insertion_in_the_flow_path
+                                File.join tester.package_namespace, Origen.interface.insertion.to_s, 'flows', *parents
+                              else
+                                File.join tester.package_namespace, 'flows', *parents
+                              end
+                            else
+                              'testflow/mfh.testflow.group'
+                            end
         end
 
         def filename
@@ -79,7 +85,7 @@ module OrigenTesters
           end
         end
 
-        def flow_name(filename = nil)
+        def flow_name(filename = nil) # rubocop:disable Lint/DuplicateMethods
           @flow_name_ = @flow_name unless smt8?
           @flow_name_ ||= begin
             flow_name = (filename || self.filename).sub(/\..*/, '').upcase
@@ -91,11 +97,11 @@ module OrigenTesters
           end
         end
 
-        def flow_bypass
+        def flow_bypass # rubocop:disable Lint/DuplicateMethods
           @flow_bypass || false
         end
 
-        def flow_description
+        def flow_description # rubocop:disable Lint/DuplicateMethods
           @flow_description || ''
         end
 
@@ -153,9 +159,8 @@ module OrigenTesters
           @ast ||= begin
             unique_id = smt8? ? nil : sig
             atp.ast(unique_id: unique_id, optimization: :smt,
-                  implement_continue: !tester.force_pass_on_continue,
-                  optimize_flags_when_continue: !tester.force_pass_on_continue
-                   )
+                    implement_continue: !tester.force_pass_on_continue,
+                    optimize_flags_when_continue: !tester.force_pass_on_continue)
           end
         end
 
@@ -188,6 +193,7 @@ module OrigenTesters
         def finalize(options = {})
           if smt8?
             return unless top_level? || options[:called_by_top_level]
+
             super
             # Refresh the ast before finalized gets set to true
             # If ast gets called by the user the finalized flag will lock it to the incorrect value
@@ -206,6 +212,7 @@ module OrigenTesters
                 unless sub_flow
                   fail "Something went wrong, couldn't find the sub-flow object for path #{path}"
                 end
+
                 # on_fail and on_pass nodes are removed because they will be rendered by the sub-flow's parent
                 sub_flow.instance_variable_set(:@ast, sub_flow_ast.remove(:on_fail, :on_pass).updated(:flow))
                 sub_flow.instance_variable_set(:@finalized, true)  # To stop the AST being regenerated
@@ -509,6 +516,7 @@ module OrigenTesters
           if smt8? && !(step == -1 || step == 1)
             fail 'SMT8 does not support steps other than -1 or 1.'
           end
+
           if step.is_a?(String) || step.is_a?(Symbol)
             step = generate_flag_name(step)
             if tester.smt7?
@@ -520,6 +528,7 @@ module OrigenTesters
           else
             var = generate_flag_name(node.to_a[3])
           end
+
           test_num_inc = node.to_a[4]
           unless smt8?
             var = "@#{var}"
@@ -560,6 +569,7 @@ module OrigenTesters
 
         def generate_expr_string(node, options = {})
           return node unless node.respond_to?(:type)
+
           case node.type
           when :eq, :ne, :gt, :ge, :lt, :le
             result = "#{generate_expr_term(node.to_a[0])} "             # operand 1
@@ -572,7 +582,8 @@ module OrigenTesters
         end
 
         def generate_expr_term(val)
-          return val if val.is_a?(Fixnum) || val.is_a?(Integer) || val.is_a?(Float)
+          return val if val.is_a?(Integer) || val.is_a?(Float)
+
           case val[0]
           when '$'
             if smt8?

data/lib/origen_testers/smartest_based_tester/base/generator.rb

@@ -83,9 +83,11 @@ module OrigenTesters
         # Returns the current flow object (Origen.interface.flow)
         def flow(id = Origen.file_handler.current_file.basename('.rb').to_s)
           return @current_flow if @current_flow
+
           id = id.to_s.sub(/_resources?/, '')
           filename = id.split('.').last
           return flow_sheets[id] if flow_sheets[id] # will return flow if already existing
+
           p = platform::Flow.new
           p.inhibit_output if Origen.interface.resources_mode?
           if id == Origen.file_handler.current_file.basename('.rb').to_s && Origen.interface.try(:use_flow_name_for_top_level)

data/lib/origen_testers/smartest_based_tester/base/limits_file.rb

@@ -36,7 +36,7 @@ module OrigenTesters
               l += ',default,default'
             else
               test_modes.each { |mode| l += ",#{mode}" }
-              test_modes.each { |mode| l += ",#{mode}" }
+              test_modes.each { |mode| l += ",#{mode}" } # rubocop:disable Style/CombinableLoops
             end
             lines << l
 
@@ -282,7 +282,7 @@ module OrigenTesters
                 # "Low Limit"
                 l << f((options[:limits][mode] || options[:limits][nil] || {})[:lsl] || 'na')
               end
-              test_modes.each do |mode|
+              test_modes.each do |mode| # rubocop:disable Style/CombinableLoops
                 # "High Limit"
                 l << f((options[:limits][mode] || options[:limits][nil] || {})[:usl] || 'na')
               end

data/lib/origen_testers/smartest_based_tester/base/pattern_master.rb

@@ -13,15 +13,15 @@ module OrigenTesters
           @paths = {}
         end
 
-        def filename
+        def filename # rubocop:disable Lint/DuplicateMethods
           @filename || flow.filename.sub('.tf', '.pmfl')
         end
 
-        def subdirectory
+        def subdirectory # rubocop:disable Lint/DuplicateMethods
           @subdirectory ||= 'vectors'
         end
 
-        def paths
+        def paths # rubocop:disable Lint/DuplicateMethods
           { '../vectors' => patterns }
         end
 

data/lib/origen_testers/smartest_based_tester/base/processors/extract_flow_vars.rb

@@ -1,4 +1,4 @@
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- needed for Ruby 2.6
 module OrigenTesters
   module SmartestBasedTester
     class Base

data/lib/origen_testers/smartest_based_tester/base/test_method.rb

@@ -4,6 +4,22 @@ module OrigenTesters
       class TestMethod
         FORMAT_TYPES = [:current, :voltage, :time, :frequency, :string, :integer, :double, :boolean, :class, :list_strings, :list_classes]
 
+        def self.parameter_sort_keys
+          @@parameter_sort_keys ||= {}
+        end
+
+        def self.installed_dynamic_methods
+          @installed_dynamic_methods ||= {}
+        end
+
+        def self.underscored_parameter_names
+          @@underscored_parameter_names ||= {}
+        end
+
+        def self.underscore_parameter_name(name)
+          underscored_parameter_names[name] ||= name.underscore
+        end
+
         # Returns the object representing the test method library that the
         # given test method is defined in
         attr_reader :library
@@ -38,8 +54,11 @@ module OrigenTesters
               unless method_name == :finalize
                 var_name = "@#{method_name}".gsub(/=|\?/, '_')
                 instance_variable_set(var_name, function)
-                define_singleton_method method_name do |*args|
-                  instance_variable_get(var_name).call(self, *args)
+                unless self.class.installed_dynamic_methods[method_name]
+                  self.class.send(:define_method, method_name) do |*args|
+                    instance_variable_get(var_name).call(self, *args)
+                  end
+                  self.class.installed_dynamic_methods[method_name] = true
                 end
               end
             end
@@ -54,19 +73,28 @@ module OrigenTesters
               allowed = type_default[2]
               @parameters[attr] = type
               aliases = [clean_attr]
-              aliases << clean_attr.underscore if clean_attr.underscore != clean_attr
+              underscored_attr = self.class.underscore_parameter_name(clean_attr)
+              aliases << underscored_attr if underscored_attr != clean_attr
               aliases.each do |alias_|
-                define_singleton_method("#{alias_}=") do |v|
-                  v = v.to_s if v.is_a?(Symbol)
-                  if allowed
-                    unless allowed.include?(v)
-                      fail "Cannot set #{alias_} to #{v}, valid values are: #{allowed.join(', ')}"
+                setter = :"#{alias_}="
+                unless self.class.installed_dynamic_methods[setter]
+                  self.class.send(:define_method, setter) do |v|
+                    v = v.to_s if v.is_a?(Symbol)
+                    if allowed
+                      unless allowed.include?(v)
+                        fail "Cannot set #{alias_} to #{v}, valid values are: #{allowed.join(', ')}"
+                      end
                     end
+                    instance_variable_set("@#{clean_attr}", v)
                   end
-                  instance_variable_set("@#{clean_attr}", v)
+                  self.class.installed_dynamic_methods[setter] = true
                 end
-                define_singleton_method(alias_) do
-                  instance_variable_get("@#{clean_attr}")
+                alias_name = alias_.to_sym
+                unless self.class.installed_dynamic_methods[alias_name]
+                  self.class.send(:define_method, alias_name) do
+                    instance_variable_get("@#{clean_attr}")
+                  end
+                  self.class.installed_dynamic_methods[alias_name] = true
                 end
               end
               send("#{clean_attr}=", default)
@@ -75,11 +103,19 @@ module OrigenTesters
           if options[:methods][:aliases]
             options[:methods][:aliases].each do |alias_, attr|
               clean_attr = clean_attr_name(attr)
-              define_singleton_method("#{alias_}=") do |v|
-                send("#{clean_attr}=", v)
+              setter = :"#{alias_}="
+              unless self.class.installed_dynamic_methods[setter]
+                self.class.send(:define_method, setter) do |v|
+                  send("#{clean_attr}=", v)
+                end
+                self.class.installed_dynamic_methods[setter] = true
               end
-              define_singleton_method(alias_) do
-                send(clean_attr)
+              alias_name = alias_.to_sym
+              unless self.class.installed_dynamic_methods[alias_name]
+                self.class.send(:define_method, alias_name) do
+                  send(clean_attr)
+                end
+                self.class.installed_dynamic_methods[alias_name] = true
               end
             end
           end
@@ -89,7 +125,7 @@ module OrigenTesters
             if respond_to?(accessor)
               send(accessor, v)
             else
-              accessor = "#{k.to_s.underscore}="
+              accessor = "#{self.class.underscore_parameter_name(k.to_s)}="
               send(accessor, v) if respond_to?(accessor)
             end
           end
@@ -122,6 +158,7 @@ module OrigenTesters
 
         def handle_val_type(val, type, attr)
           return val if val == '' && !tester.smt8?
+
           case type
           when :current, 'CURR'
             "#{val}[A]"
@@ -155,11 +192,13 @@ module OrigenTesters
             unless val.is_a?(Array)
               fail "#{val} is not an Array. List_strings must have Array values"
             end
+
             "##{val}"
           when :list_classes
             unless val.is_a?(Array)
               fail "#{val} is not an Array. List_classes must have Array values"
             end
+
             "##{val.to_s.gsub('"', '')}"
           else
             fail "Unknown type for attribute #{attr}: #{type}"
@@ -189,15 +228,13 @@ module OrigenTesters
 
         def sorted_parameters
           @parameters.sort_by do |name|
-            if name.is_a?(String)
-              name
-            else
-              if name.to_s[0] == '_'
-                name.to_s.camelize(:upper)
-              else
-                name.to_s.camelize(:lower)
-              end
-            end
+            self.class.parameter_sort_keys[name] ||= if name.is_a?(String)
+                                                       name
+                                                     elsif name.to_s[0] == '_'
+                                                       name.to_s.camelize(:upper)
+                                                     else
+                                                       name.to_s.camelize(:lower)
+                                                     end
           end
         end
 

data/lib/origen_testers/smartest_based_tester/base/test_methods/base_tml.rb

@@ -4,6 +4,10 @@ module OrigenTesters
       class TestMethods
         # Base class of all test method libraries
         class BaseTml
+          def self.test_method_classes
+            @test_method_classes ||= {}
+          end
+
           # Returns the test_methods object for the current flow
           attr_reader :test_methods
 
@@ -35,10 +39,20 @@ module OrigenTesters
           private
 
           def instantiate_test_method(method, args)
-            m = platform::TestMethod.new methods: definitions[method].dup,
-                                         attrs:   (args.first || {}),
-                                         type:    method,
-                                         library: self
+            definition = definitions[method]
+            base_class = platform::TestMethod
+            cache_key = [base_class, definition.object_id]
+            klass = BaseTml.test_method_classes[cache_key] ||= begin
+              generated_class = Class.new(base_class)
+              # Retain the definition so its object ID cannot be recycled while
+              # this generated class remains cached.
+              generated_class.instance_variable_set(:@test_method_definition, definition)
+              generated_class
+            end
+            m = klass.new methods: definition.dup,
+                          attrs:   (args.first || {}),
+                          type:    method,
+                          library: self
             test_methods.add(m)
             m
           end

data/lib/origen_testers/smartest_based_tester/base/test_methods/dc_tml.rb

@@ -94,7 +94,7 @@ module OrigenTesters
             output_dc:         {
               class_name:              'OutputDC',
               pinlist:                 [:string, ''],
-              mode:                    [:string, 'PROGRAMLOAD', %w(PROGRAMLOAD, PPMU SPMU PPMUTERM SPMUTERM)],
+              mode:                    [:string, 'PROGRAMLOAD', %w(PROGRAMLOAD PPMU SPMU PPMUTERM SPMUTERM)],
               measure_level:           [:string, 'BOTH', %(BOTH LOW HIGH)],
               force_current_low:       [:current, 0],
               force_current_high:      [:current, 0],

data/lib/origen_testers/smartest_based_tester/base/test_methods/limits.rb

@@ -19,7 +19,7 @@ module OrigenTesters
             @render = true
           end
 
-          def unit=(val)
+          def unit=(val) # rubocop:disable Lint/DuplicateMethods
             case val.to_s.downcase
             when 'v', 'volts'
               @unit = 'V'

data/lib/origen_testers/smartest_based_tester/base/variables_file.rb

@@ -11,7 +11,7 @@ module OrigenTesters
         def initialize(options = {})
         end
 
-        def subdirectory
+        def subdirectory # rubocop:disable Lint/DuplicateMethods
           @subdirectory ||= 'testflow/mfh.testflow.setup'
         end
 

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -206,12 +206,13 @@ module OrigenTesters
       def seq_path
         @seq_path || 'specs'
       end
+
       # Set the test mode(s) that you want to see in the limits files, supply an array of mode names
       # to set multiple.
       def limitfile_test_modes=(val)
         @limitfile_test_modes = Array(val).map(&:to_s)
       end
-      alias_method :limitsfile_test_modes, :limitfile_test_modes=
+      alias_method :limitsfile_test_modes, :limitfile_test_modes= # rubocop:disable Lint/DuplicateMethods
 
       # return the multiport burst name
       # provide the name you want to obtain multiport for
@@ -286,7 +287,7 @@ module OrigenTesters
           super(options)
         end
 
-        unless options_overlay.nil?
+        unless options_overlay.nil? # rubocop:disable Lint/EmptyConditionalBody, Lint/RedundantCopDisableDirective
           # stage = :body if ovly_style == :subroutine 		# always set stage back to body in case subr overlay was selected
         end
       end
@@ -368,12 +369,12 @@ module OrigenTesters
       # other platforms, such as the J750, is required.
       def store(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = { offset: 0
-                  }.merge(options)
+        options = { offset: 0 }.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For the V93K you must supply the pins to store/capture'
         end
+
         pins.each do |pin|
           pin.restore_state do
             pin.capture
@@ -395,12 +396,12 @@ module OrigenTesters
       #   $tester.cycle                # This is the vector that will be captured
       def store_next_cycle(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For the V93K you must supply the pins to store/capture'
         end
+
         pins.each { |pin| pin.save; pin.capture }
         # Register this clean up function to be run after the next vector
         # is generated, cool or what!
@@ -470,8 +471,7 @@ module OrigenTesters
       # ==== Examples
       #   $tester.handshake                   # Pass control to the tester for a measurement
       def handshake(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         ::Pattern.split(options)
       end
 
@@ -480,8 +480,7 @@ module OrigenTesters
       # ==== Examples
       #   $tester.freq_count($top.pin(:d_out))                 # Freq measure on pin "d_out"
       def freq_count(_pin, options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         ::Pattern.split(options)
       end
 
@@ -706,8 +705,7 @@ module OrigenTesters
 
       # An internal method called by Origen to create the pattern header
       def pattern_header(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         pin_list = ordered_pins.map do |p|
           if Origen.app.pin_pattern_order.include?(p.id)
             # specified name overrides pin name
@@ -738,7 +736,7 @@ module OrigenTesters
       # An internal method called by Origen to generate the pattern footer
       def pattern_footer(options = {})
         options = {
-          end_in_ka:      false
+          end_in_ka: false
         }.merge(options)
         if options[:end_in_ka]
           Origen.log.warning '93K keep alive not yet implemented!'