origen_testers 0.49.0 → 0.49.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d674d200f01a3d1d9b7c6162ecf527fa91c4466f5d59a5d6f5e0e33b4cd1a2d8
-  data.tar.gz: fcfe7c097dc04374a29521dcc476e55b4aada56bbac7c060f677eed4c5c87748
+  metadata.gz: 75b1fa14ed70e74c6a983c7214b55a575b346563b296ef6381b0d90be0ac9383
+  data.tar.gz: 644ea157e1e0b4fd0586ef09360566dd6b9d9bbfa1fb216da16b9f6de3688616
 SHA512:
-  metadata.gz: 3342964cf9787fd99bf25003963a3ff02182e325ac256161bc32eae15759f666bb7d3003ed82e63fd8e441a87b5c04bfc88d89ca54945672b9ba921adc71be02
-  data.tar.gz: 3ed6932df2fcf98baba22cbf5ddf0f50284442b501d3f4ac0df269e4acdc7b1dcf6dc2d12f77441ae1b1fa1254ff797ac3434cbda35e15dfa7ccff65c820dc1d
+  metadata.gz: 67267f477fb2fa7796e92e0d742137781b8450125fee7756c8d3996f7511db6de66069b8a1564ca436295fd928318fc2a85c47a4d198155953b8126cca49f569
+  data.tar.gz: a9bb49fb80816c242860a099f9215c30d58080d535aae0cefd61f5f7875939968ba0a376af3b87c7839e52eef57713835b1f2fbab32b67a4e64a5aa7b92b242f

data/config/version.rb

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

data/lib/origen_testers/atp/flow.rb

@@ -583,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 }
@@ -603,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)

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/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/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/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.49.0
+  version: 0.49.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen