origen_testers 0.48.1 → 0.49.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d062217b6f69bd8190818c2b24c2574bb163dab
-  data.tar.gz: 9b139b2ef824933744d66c817baba75524ff7d3b
+SHA256:
+  metadata.gz: 75b1fa14ed70e74c6a983c7214b55a575b346563b296ef6381b0d90be0ac9383
+  data.tar.gz: 644ea157e1e0b4fd0586ef09360566dd6b9d9bbfa1fb216da16b9f6de3688616
 SHA512:
-  metadata.gz: 5f0e2c810aa3f8826897a16099274fc65d307c1650dab5d60ca9d3ef84da37e390932d3802c5e4980f81304cefff12b6b31de53ee798ad132f9e708cc3aa03df
-  data.tar.gz: b1bf66931f6056f6ae314715b7e9b368534cb13b5a4bed46e364f2318e80fe57d07fd50e071adc158b8d29a3129ab49ecb724e16fa52e3e344dcd379d21b9413
+  metadata.gz: 67267f477fb2fa7796e92e0d742137781b8450125fee7756c8d3996f7511db6de66069b8a1564ca436295fd928318fc2a85c47a4d198155953b8126cca49f569
+  data.tar.gz: a9bb49fb80816c242860a099f9215c30d58080d535aae0cefd61f5f7875939968ba0a376af3b87c7839e52eef57713835b1f2fbab32b67a4e64a5aa7b92b242f

data/config/version.rb

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

data/lib/origen_testers/atp/flow.rb

@@ -439,6 +439,8 @@ module OrigenTesters::ATP
             children << on_pass(options[:on_pass]) if options[:on_pass]
           end
 
+          children << priority(options[:priority]) if options[:priority]
+
           save_conditions
           n(:test, children)
         end
@@ -581,14 +583,26 @@ module OrigenTesters::ATP
     end
 
     def loop(*args, &block)
-      unless args[0].keys.include?(:from) && args[0].keys.include?(:to) && args[0].keys.include?(:step)
-        fail 'Loop must specify :from, :to, :step'
+      unless args[0].keys.include?(:from) && args[0].keys.include?(:to)
+        fail 'Loop must specify :from, :to'
+      end
+      # assume 1 if :step not provided
+      unless args[0].keys.include?(:step)
+        args[0][:step] = 1
+      end
+      # assume 1 if :test_num_inc not provided
+      unless args[0].keys.include?(:test_num_inc)
+        args[0][:test_num_inc] = 1
+      end
+      # Add node for set of flag to be used for loop
+      unless args[0][:var].nil?
+        set(args[0][:var], 0)
       end
       extract_meta!(options) do
         apply_conditions(options) do
-          # always pass 4-element array to loop node to simplify downstream parser
-          #   last element, 'var', will be nil if not specified by loop call
-          params = [args[0][:from], args[0][:to], args[0][:step], args[0][:var]]
+          # always pass 5-element array to loop node to simplify downstream parser
+          #   element, 'var', will be nil if not specified by loop call
+          params = [args[0][:from], args[0][:to], args[0][:step], args[0][:var], args[0][:test_num_inc]]
 
           node = n(:loop, params)
           node = append_to(node) { block.call }
@@ -601,7 +615,7 @@ module OrigenTesters::ATP
       define_method method do |*args, &block|
         options = args.pop if args.last.is_a?(Hash)
         unless args.size == 2
-          fail "Format for relational operation must match: ':<opertor>(var1, var2)'"
+          fail "Format for relational operation must match: ':<operator>(var1, var2)'"
         end
         n2(method.to_sym, args[0], args[1])
       end unless method_defined?(method)
@@ -810,6 +824,10 @@ module OrigenTesters::ATP
       n1(:id, name)
     end
 
+    def priority(name)
+      n1(:priority, name)
+    end
+
     def on_fail(options = {})
       if options.is_a?(Proc)
         node = n0(:on_fail)

data/lib/origen_testers/flow.rb

@@ -205,6 +205,8 @@ module OrigenTesters
     def active_description
       flow_file = OrigenTesters::Flow.callstack.last
       called_from = caller.find { |l| l =~ /^#{flow_file}:.*/ }
+      # Windows fix - prevent the drive letter in the file name from changing the index of the line_no below
+      called_from.gsub!(flow_file, '')
       desc = nil
       if called_from
         called_from = called_from.split(':')
@@ -257,8 +259,10 @@ module OrigenTesters
       flow_file = OrigenTesters::Flow.callstack.last
       called_from = caller.find { |l| l =~ /^#{flow_file}:.*/ }
       if called_from
+        # Splitting on ':' when file names are included will yield a different index for everything in Windows
+        called_from.gsub!(flow_file, '')
         called_from = called_from.split(':')
-        options[:source_file] = called_from[0]
+        options[:source_file] = flow_file # called_from[0]
         options[:source_line_number] = called_from[1].to_i
       end
     end

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

@@ -430,7 +430,8 @@ module OrigenTesters
         end
 
         def clean_flag(flag)
-          flag = flag.to_s
+          # Added .dup to below line to get an unfrozen copy of the string, corrects a run time error
+          flag = flag.to_s.dup
           if flag[0] == '$'
             flag[0] = ''
           end

data/lib/origen_testers/igxl_based_tester/ultraflex/flow.rb

@@ -10,14 +10,20 @@ module OrigenTesters
         def on_test(node)
           super
           ins = node.find(:object).value
-          if ins.respond_to?(:lo_limit) && (ins.lo_limit || ins.hi_limit) || ins.respond_to?(:lo) && (ins.lo || ins.hi)
+
+          # allow defer limits when limits are only given in sub tests
+          if ins.respond_to?(:defer_limits)
             if ins.defer_limits
               completed_lines.last.opcode = 'Test-defer-limits'
             end
+          end
+
+          if ins.respond_to?(:lo_limit) && (ins.lo_limit || ins.hi_limit) || ins.respond_to?(:lo) && (ins.lo || ins.hi)
             limit = completed_lines.last.dup
             limit.type = :use_limit
             limit.opcode = 'Use-Limit'
             limit.parameter = nil
+            limit.tnum = nil                            # Don't duplate test numbers, allow auto-increment by leaving blank
             if ins.respond_to?(:lo_limit)
               lo = ins.lo_limit
               hi = ins.hi_limit

data/lib/origen_testers/labview_based_tester/pxie6570.rb

@@ -36,7 +36,7 @@ module OrigenTesters
         unless options[:subroutine_pat]
           stage.with_bank(:body) do
             # find the first vector
-            stage.bank.delete_at(0) until stage.bank[0].is_a?(OrigenTesters::Vector)
+            stage.bank.delete_at(0) until stage.bank[0].is_a?(OrigenTesters::Vector) || stage.bank.empty?
           end
         end
       end

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -115,6 +115,7 @@ module OrigenTesters
         @overlay_style = :subroutine	# default to use subroutine for overlay
         @capture_style = :hram			# default to use hram for capture
         @overlay_subr = nil
+        @overlay_history = {} # used to track labels, subroutines, digsrc pins used etc
 
         if options[:add_flow_enable]
           self.add_flow_enable = options[:add_flow_enable]
@@ -203,6 +204,12 @@ module OrigenTesters
             when :subroutine, :default
               subroutine_overlay(overlay_str, options)
               ovly_style = :subroutine
+            when :label, :global_label
+              options[:dont_compress] = true
+              unless @overlay_history.key?(overlay_str)
+                cc "#{overlay_str}"
+                @overlay_history[overlay_str] = { is_label: true }
+              end
             when :handshake
               if @delayed_handshake
                 if @delayed_handshake != overlay_str

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

@@ -462,6 +462,41 @@ module OrigenTesters
         alias_method :on_whenever_any, :on_whenever
         alias_method :on_whenever_all, :on_whenever
 
+        def on_loop(node, options = {})
+          # TODO: don't have the SMT8 way to do this yet
+          if smt8?
+            fail 'Flow loop control not yet supported for SMT8!'
+          end
+          start = node.to_a[0]
+          stop = node.to_a[1]
+          step = node.to_a[2]
+          if node.to_a[3].nil?
+            fail 'You must supply a loop variable name!'
+          else
+            var = generate_flag_name(node.to_a[3])
+          end
+          test_num_inc = node.to_a[4]
+          unless smt8?
+            var = "@#{var}"
+          end
+          num = (stop - start) / step + 1
+          # Handle increment/decrement
+          if step < 0
+            compare = '>'
+            incdec = "- #{step * -1}"
+          else
+            compare = '<'
+            incdec = "+ #{step}"
+          end
+          line "for #{var} = #{start}; #{var} #{compare} #{stop + step} ; #{var} = #{var} #{incdec}; do"
+          line "test_number_loop_increment = #{test_num_inc}"
+          line '{'
+          @indent += 1
+          process_all(node.children)
+          @indent -= 1
+          line '}'
+        end
+
         def generate_expr_string(node, options = {})
           return node unless node.respond_to?(:type)
           case node.type

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

@@ -119,6 +119,7 @@ module OrigenTesters
           o[:test_name] = extract_test_name(node, o)
           o[:test_number] = extract_test_number(node, o)
           o[:limits] = extract_limits(node, o)
+          o[:priority] = extract_priority(node, o)
           o[:test_text] = node.find(:test_text).try(:value)
           if on_fail = node.find(:on_fail)
             if set_result = on_fail.find(:set_result)
@@ -141,7 +142,7 @@ module OrigenTesters
             end
             if smt8?
               if o[:bin_s_num]
-                limits_workbook.add_softbin o[:bin_s_num], name: o[:bin_s_name], bin: o[:bin_h_num]
+                limits_workbook.add_softbin o[:bin_s_num], name: o[:bin_s_name], bin: o[:bin_h_num], priority: o[:priority]
               end
               if o[:bin_h_num]
                 limits_workbook.add_bin o[:bin_h_num], name: o[:bin_h_name]
@@ -217,6 +218,16 @@ module OrigenTesters
           name
         end
 
+        def extract_priority(node, o)
+          test_obj = node.find(:priority).to_a[0]
+          if test_obj.is_a?(Hash)
+            priority = test_obj['Priority']
+          else
+            priority = test_obj.respond_to?(:priority) ? test_obj.priority : test_obj if test_obj
+          end
+          priority
+        end
+
         def extract_test_name(node, o)
           test_obj = node.find(:object).to_a[0]
           if smt8?

data/lib/origen_testers/test/interface.rb

@@ -285,6 +285,31 @@ module OrigenTesters
         end
       end
 
+      def meas_multi_limits(name, options = {})
+        options = {
+          duration: :static
+        }.merge(options)
+
+        name = "measmulti_#{name}" unless name.to_s =~ /measmulti/
+
+        if tester.uflex?
+          ins = test_instances.functional(name)
+          ins.set_wait_flags(:a) if options[:duration] == :dynamic
+          ins.pin_levels = options.delete(:pin_levels) if options[:pin_levels]
+          ins.defer_limits = options[:defer_limits]
+
+          # some made up sub test limits
+          options[:sub_tests] = [sub_test('limit1', lo: 0, hi: 7), sub_test('limit2', lo: 3, hi: 8)]
+
+          pname = "#{name}_pset"
+          patsets.add(pname, [{ pattern: "#{name}.PAT" },
+                              { pattern: 'nvm_global_subs.PAT', start_label: 'subr' }])
+          ins.pattern = pname
+
+          flow.test(ins, options)
+        end
+      end
+
       def meas(name, options = {})
         options = {
           duration: :static

data/program/flow_control.rb

@@ -254,7 +254,6 @@ Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Contro
   enable :nvm_minimum_ft, if_enable: "nvm_minimum_room", if_job: :fr
   enable :nvm_minimum_ft, if_enable: "nvm_minimum_cold", if_job: :fc
   disable :nvm_minimum_ft, if_enable: "nvm_minimum_hot", if_job: :fh
-
   log "Test enable words that wrap a lot of tests"
   if_enable :word1 do
     5.times do |i|
@@ -340,6 +339,39 @@ Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Contro
     func :test36, on_fail: { render: 'multi_bin;' }, if_flag: :my_flag, number: 51570
   end
 
+  if tester.v93k? && !tester.smt8?
+    log "Tests of flow loop"
+    loop from: 0, to: 5, step: 1, var: '$LOOP_VARIABLE' do
+      func :test_myloop, number: 56000
+    end
+
+    log "Tests of flow loop, no step"
+    loop from: 0, to: 5, var: '$LOOP_VARIABLE' do
+      func :test_myloop2, number: 5610
+    end
+
+    log "Tests of flow loop, non-default test number increment" 
+    loop from: 0, to: 5, var: '$LOOP_VARIABLE', test_num_inc: 2 do
+      func :test_myloop3, number: 56200
+    end
+ 
+    log "Tests of decrementing loop"
+    loop from: 5, to: 2, step: -1, var: '$LOOP_VARIABLE' do
+      func :test_myloop4, number: 56300
+    end
+ 
+    log "Tests of nested flow loop, depth 3"
+    loop from: 0, to: 9, step: 2, var: '$LOOP_VARIABLE1'do
+      loop from: 1, to: 10, step: 1, var: '$LOOP_VARIABLE2' do
+        loop from: 1, to: 5, step: 1, var: '$LOOP_VARIABLE3' do
+          func :test_myloop5, number: 56400
+        end
+      end
+    end
+
+    # Test of skipping variable name not yet ready
+  end
+
   log 'An optimization test case, this should not generate a flag on V93K'
   func :test1, id: :t1a, number: 51580
 

data/program/flow_control_flag_bug.rb

@@ -0,0 +1,25 @@
+# Flow to exercise the Flow Control API
+#
+# Some of the other flows also cover the flow control API and those tests are used
+# to guarantee that the test ID references work when sub-flows are involved.
+# This flow provides a full checkout of all flow control methods.
+Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Control Testing" do
+  flow.flow_description = 'Flow to exercise the Flow Control API' if tester.v93k?
+
+  self.resources_filename = 'flow_control'
+
+  log "Mixed-case manual flags"
+  test :test1, on_fail: { set_flag: :$My_Mixed_Flag }, continue: true, number: 51420
+  test :test2, if_flag: "$My_Mixed_Flag", number: 51430
+  unless_flag "$My_Mixed_Flag" do
+    test :test3, number: 51440
+  end
+  
+  log "Mixed-case manual flags - induce frozen string error"
+  test :test4, on_fail: { set_flag: :$My_Mixed_Flag }, continue: true, number: 51450
+  test :test5, if_flag: "$My_Mixed_Flag", number: 51460
+  unless_flag "$My_Mixed_Flag" do
+    test :test6, number: 51470
+  end
+
+end

data/program/test.rb

@@ -28,6 +28,8 @@ Flow.create interface: 'OrigenTesters::Test::Interface' do
   end
 
   if tester.uflex?
+    meas_multi_limits :bin_now, tnum: 3000, bin: 119, soft_bin: 2
+    meas_multi_limits :bin_later, tnum: 3000, bin: 119, soft_bin: 2, defer_limits: true
     log "Test of ultraflex render API"
     line = flow.ultraflex.use_limit
     line.units = "Hz"

data/templates/origen_guides/program/flowapi.md.erb

@@ -339,4 +339,37 @@ end
 ~~~
 
 
+#### Flow Loops for V93k (SMT7 only)
+Use flow loop control to permit re-running tests without using additional sequence labels.
+
+~~~ruby
+loop from: 0, to: 5, step: 1, var: '$LOOP_VARIABLE' do
+  func :test_myloop, number: 56000
+end
+~~~
+
+Indicating step value is optional, default is 1.
+
+These loops can also be nested:
+~~~ruby
+loop from: 0, to: 9, step: 2, var: '$LOOP_VARIABLE1'do
+  loop from: 1, to: 10, step: 1, var: '$LOOP_VARIABLE2' do
+    loop from: 1, to: 5, step: 1, var: '$LOOP_VARIABLE3' do
+      func :test_myloop5, number: 56400
+    end
+  end
+end
+~~~
+
+You can also indicate a test number increment if desired (default is 1):
+~~~ruby
+loop from: 0, to: 5, var: '$LOOP_VARIABLE', test_num_inc: 2 do
+    func :test_myloop3, number: 56200
+end
+~~~
+
+Decrementing loops, having `from:` value > `to:` value and using negative `step:`, is also supported.
+ 
+
+
 % end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.48.1
+  version: 0.49.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.57.1
+- !ruby/object:Gem::Dependency
+  name: dentaku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -516,6 +530,7 @@ files:
 - program/components/_temp.rb
 - program/custom_tests.rb
 - program/flow_control.rb
+- program/flow_control_flag_bug.rb
 - program/prb1.rb
 - program/prb1_resources.rb
 - program/prb2.rb
@@ -584,8 +599,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like