origen_testers 0.50.0 → 0.51.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5895221d7385ac33677fffba9d998bf29a475978677f740968f1cfda57677e1
-  data.tar.gz: 5f623aacb11d0ea9b56b36fd3186cf32dbf2724e034de5d2b1822e02c507aa53
+  metadata.gz: d6f96fa1f3c65b7ab6cd0fb2c25abb378ef0cd0d9489a05cc7c94eb05becf628
+  data.tar.gz: 0d465b02299aceb26467727fd021736b78c959d46ece03fddd0c581495291e3d
 SHA512:
-  metadata.gz: bae858530cf088b08ac1938411815e6d67fe86524fa98824f328583dfa6c319e5143588b868edd16ffef31a119e665e64cde113d0ea5c71ba8dd0ddb3b899529
-  data.tar.gz: 368c6d87bf5fb030e83cf96283c0d6ce43844a442f2719a10a76ddf3c2f4906ef7cd4012d7fdea9bf5eec4f39aedfaa0f1bba0276892978e2e91c26495ac9168
+  metadata.gz: d08fd272bc3331a87ac33011d22386e535981d376c0c995c4d3605794e6a7c3be7d755f69b0d851e22bf398692e98b516ce19999860e4b46fbba7af3ee1123e2
+  data.tar.gz: b754e33f7577da5f100e93cb7b020ad8abf014e8e7b102d17e07bace411ff5e20df0c47e5e033f74fab814ccda0bc6b89fc1b2e5e768b8cb13b9e2e03ae4a32e

data/config/commands.rb

@@ -200,7 +200,7 @@ when "examples", "test"
     puts
     puts "To approve any diffs in the reference.list files run the following command:"
     puts
-    platforms = %w(j750 j750_hpt ultraflex v93k v93k_multiport v93k_enable_flow v93k_disable_flow v93k_limits_file v93k_global v93k_smt8) # put here the various platforms used in examples/program_generator.rb
+    platforms = %w(j750 j750_literals j750_hpt ultraflex ultraflex_literals v93k v93k_multiport v93k_enable_flow v93k_disable_flow v93k_limits_file v93k_global v93k_smt8) # put here the various platforms used in examples/program_generator.rb
     reflist_command = ''
     platforms.each do |platform|
       unless reflist_command == ''

data/config/version.rb

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

data/lib/origen_testers/atp/flow.rb

@@ -220,6 +220,15 @@ module OrigenTesters::ATP
       @pipeline[0] = add_volatile_flags(@pipeline[0], flags)
     end
 
+    # Indicate the that given flags should keep state between units
+    # prevent them from being in the initialization block
+    # these flags will be the user's responsibility to initialize
+    def add_global_flag(*flags)
+      options = flags.pop if flags.last.is_a?(Hash)
+      flags = flags.flatten
+      @pipeline[0] = add_global_flag_to_node(@pipeline[0], flags)
+    end
+
     # Record a description for a bin number
     def describe_bin(number, description, options = {})
       @pipeline[0] = add_bin_description(@pipeline[0], number, description, type: :hard)
@@ -947,6 +956,24 @@ module OrigenTesters::ATP
       node.updated(nil, [name, v] + nodes)
     end
 
+    # Ensures the flow ast has a global node, then adds the
+    # given flags to it
+    def add_global_flag_to_node(node, flags)
+      name, *nodes = *node
+      if nodes[0] && nodes[0].type == :global
+        v = nodes.shift
+      else
+        v = n0(:global)
+      end
+      existing = v.children.map { |f| f.type == :flag ? f.value : nil }.compact
+      new = []
+      flags.each do |flag|
+        new << n1(:flag, flag) unless existing.include?(flag)
+      end
+      v = v.updated(nil, v.children + new)
+      node.updated(nil, [name, v] + nodes)
+    end
+
     # Ensures the flow ast has a bin descriptions node, then adds the
     # given description to it
     def add_bin_description(node, number, description, options)

data/lib/origen_testers/atp/flow_api.rb

@@ -8,7 +8,7 @@ module OrigenTesters::ATP
       @atp
     end
 
-    ([:test, :bin, :pass, :continue, :cz, :log, :sub_test, :volatile, :set_flag, :set, :enable, :disable, :render,
+    ([:test, :bin, :pass, :continue, :cz, :log, :sub_test, :volatile, :add_global_flag, :set_flag, :set, :enable, :disable, :render,
       :context_changed?, :ids, :describe_bin, :describe_softbin, :describe_soft_bin, :loop] +
       OrigenTesters::ATP::Flow::CONDITION_KEYS.keys + OrigenTesters::ATP::Flow::RELATIONAL_OPERATORS).each do |method|
       define_method method do |*args, &block|

data/lib/origen_testers/atp/processor.rb

@@ -33,6 +33,8 @@ module OrigenTesters::ATP
         n = process(node)
         if n.respond_to?(:type) && n.type == :inline
           results += n.children
+        elsif n.respond_to?(:type) && n.type == :global
+          add_global_flag(n.to_a[0].value)
         else
           results << n unless n.respond_to?(:type) && n.type == :remove
         end
@@ -64,6 +66,32 @@ module OrigenTesters::ATP
       result
     end
 
+    def add_global_flag(flag)
+      # Had to do @@ because the state got lost after the recursive calls
+      @@globals ||= {}
+      @@globals[:flags] ||= []
+      @@globals[:flags] << flag
+    end
+
+    def extract_globals(flow)
+      @@globals ||= {}
+      if v = flow.find(:global)
+        @@globals[:flags] ||= []
+        @@globals[:flags] += Array(v.find_all(:flag)).map(&:value) if v.respond_to?(:find_all) && v.method(:find_all).parameters.size == 1
+      end
+    end
+
+    def global_flags
+      @@globals ||= {}
+      @@globals[:flags] || []
+    end
+
+    # Returns true if the given flag name has been marked as global
+    def global_flag?(flag)
+      result = global_flags.any? { |f| clean_flag(f) == clean_flag(flag) }
+      result
+    end
+
     def clean_flag(flag)
       flag = flag.dup.to_s
       flag[0] = '' if flag[0] == '$'

data/lib/origen_testers/atp/processors/pre_cleaner.rb

@@ -9,15 +9,25 @@ module OrigenTesters::ATP
       end
 
       # Make all IDs lower cased symbols
+      # unless literal_flags is set
       def on_id(node)
         id = node.to_a[0]
-        node.updated(nil, [clean(id)])
+        if tester.literal_flags
+          node.updated(nil, [id])
+        else
+          node.updated(nil, [clean(id)])
+        end
       end
 
       # Make all ID references use the lower case symbols
+      # unless literal_flags is set
       def on_if_failed(node)
         id, *children = *node
-        node.updated(nil, [clean(id)] + process_all(children))
+        if tester.literal_flags
+          node.updated(nil, [id] + process_all(children))
+        else
+          node.updated(nil, [clean(id)] + process_all(children))
+        end
       end
       alias_method :on_if_passed, :on_if_failed
       alias_method :on_if_any_failed, :on_if_failed

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

@@ -129,7 +129,7 @@ module OrigenTesters
               current_line.flag_pass = flag
             end
           else
-            unless set_previously
+            if !set_previously && !global_flags.include?(flag)
               completed_lines << platform::FlowLine.new(:defaults, flag_fail: flag)
             end
             completed_lines << new_line(:flag_true, parameter: flag)
@@ -425,7 +425,11 @@ module OrigenTesters
             flag[0] = ''
             flag
           else
-            flag.downcase
+            if tester.literal_enables
+              flag
+            else
+              flag.downcase
+            end
           end
         end
 

data/lib/origen_testers/igxl_based_tester/base.rb

@@ -23,6 +23,11 @@ module OrigenTesters
       attr_accessor :min_repeat_loop
       alias_method :min_repeat_count, :min_repeat_loop
       alias_method :min_repeat_count=, :min_repeat_loop=
+
+      # Control literal flag definitions
+      attr_accessor :literal_flags      # whether flags should be exactly as indicated
+      attr_accessor :literal_enables    # whether enables should be exactly as indicated
+
       # NOTE: DO NOT USE THIS CLASS DIRECTLY ONLY USED AS PARENT FOR
       # DESIRED TESTER CLASS
 
@@ -64,6 +69,13 @@ module OrigenTesters
         @overlay_history = {}			# used to track labels, subroutines, digsrc pins used etc
         @overlay_subr = nil
         @capture_history = {}
+
+        if options[:literal_flags]
+          @literal_flags = true
+        end
+        if options[:literal_enables]
+          @literal_enables = true
+        end
       end
 
       def igxl_based?

data/lib/origen_testers/igxl_based_tester/j750.rb

@@ -26,8 +26,8 @@ module OrigenTesters
 
       # Returns a new J750 instance, normally there would only ever be one of these
       # assigned to the global variable such as $tester by your target.
-      def initialize
-        super
+      def initialize(options = {})
+        super(options)
         @pipeline_depth = 34  # for extended mode is vectors, for normal mode is vector pairs (54 for J750Ex)
         @use_hv_pin = false   # allows to use high voltage for a pin for all patterns
         @software_version = '3.50.40'

data/lib/origen_testers/igxl_based_tester/j750_hpt.rb

@@ -14,8 +14,8 @@ module OrigenTesters
     class J750_HPT < J750
       require 'origen_testers/igxl_based_tester/j750_hpt/generator.rb'
 
-      def initialize
-        super
+      def initialize(options = {})
+        super(options)
         @@hpt_mode = true
         @drive_hi_state = '.1'
         @drive_lo_state = '.0'

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

@@ -37,6 +37,10 @@ module OrigenTesters
           @var_filename || 'global'
         end
 
+        def set_var_filename(new_var_filename)
+          @var_filename = new_var_filename
+        end
+
         def subdirectory
           @subdirectory ||= begin
             if smt8?
@@ -218,6 +222,10 @@ module OrigenTesters
           @post_test_lines = []
           @stack = { on_fail: [], on_pass: [] }
           @set_runtime_variables = ast.excluding_sub_flows.set_flags
+          global_flags.each do |global_var_name|
+            @set_runtime_variables.delete(global_var_name)
+            @set_runtime_variables.delete('$' + global_var_name)
+          end
           process(ast)
           unless smt8?
             unless flow_variables[:empty?]

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -27,6 +27,10 @@ module OrigenTesters
       alias_method :min_repeat_count, :min_repeat_loop
       alias_method :min_repeat_count=, :min_repeat_loop=
 
+      # Control literal flag definitions
+      attr_accessor :literal_flags      # whether flags should be exactly as indicated
+      attr_accessor :literal_enables    # whether enables should be exactly as indicated
+
       # permit option to generate multiport type patterns
       # and use multiport type code
       attr_accessor :multiport
@@ -140,6 +144,13 @@ module OrigenTesters
             @create_limits_file = false
           end
         end
+        if options[:literal_flags]
+          @literal_flags = true
+        end
+        if options[:literal_enables]
+          @literal_enables = true
+        end
+
         @package_namespace = options.delete(:package_namespace)
         self.limitfile_test_modes = options[:limitfile_test_modes] || options[:limitsfile_test_modes]
         self.force_pass_on_continue = options[:force_pass_on_continue]

data/program/flow_control.rb

@@ -309,6 +309,16 @@ Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Contro
     test :test2, number: 51470
   end
 
+  log 'Test global flag functionality'
+  add_global_flag :global
+  test :global_test1, on_fail: { set_flag: :$non_global }, continue: true
+  unless_flag "$global" do
+    set_flag '$non_global'
+  end
+  if_flag "$non_global" do
+    set_flag '$global'
+  end
+
   if tester.v93k?
     log "This should retain the set-run-flag in the else conditional"
     func :test22, id: :at22, number: 51480

data/program/flow_control_literals.rb

@@ -0,0 +1,139 @@
+# Flow to exercise the Flow Control API related to using exact literal value of flag (no lowercase or cleanup) as
+# controlled at tester API level
+#
+# 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 Flag/Enable Literal Testing" do
+  flow.flow_description = 'Flow to exercise the Flow Control API' if tester.v93k?
+
+  self.resources_filename = 'flow_control'
+
+  log "Test that if_failed works using Literal"
+  func :read1, id: :Test__Flag1, bin: 10, number: 50000
+  func :erase1, if_failed: :Test__Flag1, bin: 12, number: 50010
+
+  log "Test the block form of if_failed"
+  func :read2, id: :Test__Flag2, bin: 10, number: 50020
+  if_failed :Test__Flag2 do
+    func :erase2, number: 50030
+    func :erase2, number: 50040
+  end
+
+  log "Test that if_passed works"
+  func :read1, id: :Test__Flag3, bin: 10, number: 50050
+  func :pgm1, if_passed: :Test__Flag3, number: 50060
+
+  log "Test the block form of if_passed"
+  func :read2, id: :Test__Flag4, bin: 10, number: 50070
+  if_passed :Test__Flag4 do
+    func :pgm1, number: 50080
+    func :pgm1, number: 50090
+  end
+
+  log "Test that if_ran works"
+  func :pgm, id: :Test__Flag5, bin: 10, number: 50100
+  func :read0, if_ran: :Test__Flag5, number: 50110
+
+  log "Test the block form of if_ran"
+  func :pgm, id: :Test__Flag6, bin: 10, number: 50120
+  if_ran :Test__Flag6 do
+    func :read0, number: 50130
+    func :read0, number: 50140
+  end
+
+  log "Test that unless_ran works"
+  func :pgm, id: :Test__Flag7, bin: 10, number: 50150
+  func :read0, unless_ran: :Test__Flag7, number: 50160
+
+  log "Test the block form of unless_ran"
+  func :pgm, id: :Test__Flag8, bin: 10, number: 50170
+  unless_ran :Test__Flag8 do
+    func :read0, number: 50180
+    func :read0, number: 50190
+  end
+
+  log "Test that if_enable works"
+  func :extra_test, if_enable: :Extras__123, number: 50270
+
+  log "Test the block form of if_enable"
+  if_enable :Cz__123 do
+    func :cz_test1, number: 50280
+    func :cz_test2, number: 50290
+  end
+
+  log "Test that unless_enable works"
+  func :long_test, unless_enable: :Quick__123, number: 50300
+
+  log "Test the block form of unless_enable"
+  unless_enable :Quick__123 do
+    func :long_test1, number: 50310
+    func :long_test2, number: 50320
+  end
+
+  log "Test that if_any_failed works"
+  func :test1, id: :iFA__1, number: 50330
+  func :test2, id: :iFA__2, number: 50340
+  func :test3, if_any_failed: [:iFA__1, :iFA__2], number: 50350
+
+  log "Test the block form of if_any_failed"
+  func :test1, id: :OOF__Passcode1, number: 50360
+  func :test2, id: :OOF__Passcode2, number: 50370
+  if_any_failed :OOF__Passcode1, :OOF__Passcode2 do
+    func :test3, number: 50380
+    func :test4, number: 50390
+  end
+
+  log "Test that if_all_failed works"
+  func :test1, id: :iFall__1, number: 50400
+  func :test2, id: :iFall__2, number: 50410
+  func :test3, if_all_failed: [:iFall__1, :iFall__2], number: 50420
+
+  log "Test the block form of if_all_failed"
+  func :test1, id: :iFall__B1, number: 50430
+  func :test2, id: :iFall__B2, number: 50440
+  if_all_failed [:iFall__B1, :iFall__B2] do
+    func :test3, number: 50450
+    func :test4, number: 50460
+  end
+
+  log "Test that if_any_passed works"
+  func :test1, id: :if__AP1, number: 50470
+  func :test2, id: :if__AP2, number: 50480
+  func :test3, if_any_passed: [:if__AP1, :if__AP2], number: 50490
+
+  log "Test the block form of if_any_passed"
+  func :test1, id: :if__APB1, number: 50500
+  func :test2, id: :if__APB2, number: 50510
+  if_any_passed :if__APB1, :if__APB2 do
+    func :test3, number: 50520
+    func :test4, number: 50530
+  end
+
+  log "Test that if_all_passed works"
+  func :test1, id: :iFall__P1, number: 50540
+  func :test2, id: :iFall__P2, number: 50550
+  func :test3, if_all_passed: [:iFall__P1, :iFall__P2], number: 50560
+
+  log "Test the block form of if_all_passed"
+  func :test1, id: :iFall__PB1, number: 50570
+  func :test2, id: :iFall__PB2, number: 50580
+  if_all_passed :iFall__PB1, :iFall__PB2 do
+    func :test3, number: 50590
+    func :test4, number: 50600
+  end
+
+  log "Test that group-level dependencies work"
+  group "grp1", id: :Group__1 do
+    func :grp1_test1, bin: 5, number: 50610
+    func :grp1_test2, bin: 5, number: 50620
+    func :grp1_test3, bin: 5, number: 50630
+  end
+
+  group "grp2", if_failed: :Group__1 do
+    func :grp2_test1, bin: 5, number: 50640
+    func :grp2_test2, bin: 5, number: 50650
+    func :grp2_test3, bin: 5, number: 50660
+  end
+
+end

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

@@ -305,6 +305,19 @@ end
 
 In all cases the `$` will be removed from the final flag name that appears in the test program.
 
+Whenever you set a flag or automation initializes a variable, you can remove the variable from initialization flow by labeling as a global flag
+with the `add_global_flag` API. The below example will set the `global` variable in the flow but not initialize it to a value. `non_global` will behave as normal.
+
+~~~ruby
+add_global_flag :global
+test :global_test1, on_fail: { set_flag: :$non_global }, continue: true
+unless_flag "$global" do
+  set_flag '$non_global'
+end
+if_flag "$non_global" do
+  set_flag '$global'
+end
+~~~
 
 
 #### Adding the V93K bypass option:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.51.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 0.60.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 0.60.7
 - !ruby/object:Gem::Dependency
   name: dentaku
   requirement: !ruby/object:Gem::Requirement
@@ -532,6 +532,7 @@ files:
 - program/custom_tests.rb
 - program/flow_control.rb
 - program/flow_control_flag_bug.rb
+- program/flow_control_literals.rb
 - program/prb1.rb
 - program/prb1_resources.rb
 - program/prb2.rb
@@ -600,7 +601,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.31
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like