origen_testers 0.49.3 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d3544735522514276c1f11198d48015f587645bb434cb5ff5e1cd877dd799c
-  data.tar.gz: 99b3a18e65bd837febf9b9d6cfa1043f447c5cbc02aec73902c35312d2e9f266
+  metadata.gz: c5ff2e2f1b209e2dadbf045bc52f45361a8220f7f43b5fa27a1782f6c2b61a9e
+  data.tar.gz: a0387e3b6629f520a42dde25ae6c5b78a86d4f93a1beefbff6bd865988b8577d
 SHA512:
-  metadata.gz: 87fb0d43358361dc87fb0db076c75050edfd26c4e4e5c8b62eb21d4794f4a5efe314a019cf7ede6e1d93f31184829e52cf50852c8aac9ffc573bceb97a9eba0e
-  data.tar.gz: d3ff0b325eecffe7a7f61cdc16473fd737b798cfa8dc5c7404ff60831407bdc441bcc158975cf9e34c0110c191287f05d03b056e8f2962bb6fdc7e4e278b37eb
+  metadata.gz: 8c1b698fc08e769ce66ce5b65073f1aa3644b59497587849338c6fa343c615e42c5300e45238d4f706c347d6b7e354aab7fae28541f90f8845ee3cdcd0633a72
+  data.tar.gz: a227d7203f78c6d36aa2963478067b8e4a7746e588f464d680da7e36069f48fa2bbed19743d8e2923045bb53adb42856ab700061bd52492d28bf0c188f7c2db3

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 = 49
-  BUGFIX = 3
+  MINOR = 51
+  BUGFIX = 0
   DEV = nil
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
 end

data/lib/origen_testers/atp/flow.rb

@@ -337,8 +337,11 @@ module OrigenTesters::ATP
 
           name = (options[:name] || options[:tname] || options[:test_name])
           unless name
-            [:name, :tname, :test_name].each do |m|
-              name ||= instance.respond_to?(m) ? instance.send(m) : nil
+            # Starting in Ruby3 type Symbol responds to name
+            unless instance.is_a?(Symbol)
+              [:name, :tname, :test_name].each do |m|
+                name ||= instance.respond_to?(m) ? instance.send(m) : nil
+              end
             end
           end
           children << n1(:name, name) if name

data/lib/origen_testers/atp/parser.rb

@@ -2,6 +2,7 @@ require 'sexpistol'
 module OrigenTesters::ATP
   class Parser < Sexpistol
     def initialize
+      # This accessor moves to Sexpistol::Parser in newer versions of the gem
       self.ruby_keyword_literals = true
     end
 

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/decompiler/pattern/splitter.rb

@@ -52,7 +52,7 @@ module OrigenTesters
         end
 
         def split!
-          section_indices = split(splitter_config)
+          section_indices = split(**splitter_config)
 
           # Check that we found each section in the pattern.
           if section_indices[:pinlist_start].nil?

data/lib/origen_testers/decompiler/pattern.rb

@@ -51,7 +51,11 @@ module OrigenTesters
       include EnumerableExt
       include SpecHelpers
 
-      def initialize(source, direct_source: false, no_verify: false)
+      def initialize(source, options = {})
+        options = { direct_source: false, no_verify: false }.merge(options)
+        direct_source = options[:direct_source]
+        no_verify = options[:no_verify]
+
         if source.is_a?(File)
           source = source.path
         end

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

@@ -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,12 +23,17 @@ 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
 
       # Returns a new IGXLBasedTester instance, normally there would only ever be one of these
       # assigned to the global variable such as $tester by your target.
-      def initialize
+      def initialize(options = {})
         @unique_counter = 0
         @counter_lsb_bits = 0
         @counter_msb_bits = 0
@@ -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/igxl_based_tester/ultraflex.rb

@@ -4,6 +4,10 @@ module OrigenTesters
     class UltraFLEX < Base
       autoload :Generator,   'origen_testers/igxl_based_tester/ultraflex/generator.rb'
 
+      # Read or update the digital instrument
+      #  Ex: tester.digital_instrument = 'hsdmq'
+      attr_accessor :digital_instrument
+
       # Tester model to generate .atp patterns for the Teradyne UltraFLEX
       #
       # == Basic Usage
@@ -18,8 +22,9 @@ module OrigenTesters
 
       # Returns a new UltraFLEX 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)
+        options = { digital_instrument: 'hsdm' }.merge(options)
         @pipeline_depth = 255  # for single mode
         @software_version = '8.10.10'
         @name = 'ultraflex'
@@ -36,7 +41,7 @@ module OrigenTesters
         # this handled in pattern_header below
         @min_pattern_vectors = (@opcode_mode == :single) ? 64 : 128
 
-        @digital_instrument = 'hsdm' # 'hsdm' for HSD1000 and UP800, ok with UP1600 though
+        @digital_instrument = options[:digital_instrument] # 'hsdm' for HSD1000 and UP800, ok with UP1600 though
 
         @capture_state = 'V'            # STV requires valid 'V' expect data
 

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/pattern/uflex_digital_instrument.rb

@@ -0,0 +1,3 @@
+Pattern.create do
+  tester.digital_instrument = 'hsdp' if tester.respond_to?(:digital_instrument)
+end

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/pattern/ultraflex.md.erb

@@ -27,4 +27,16 @@ for a given pin.
   # Overlay operations can happen after this point
 ~~~
 
+### Digital Instrument
+
+The default digital instrument used is hsdm. This can be changed with either a create option or through an accessor:
+
+~~~ruby
+  # Instantiate with a different digital instrument
+  OrigenTesters::UltraFLEX.new(digital_instrument: 'hsdmq')
+  
+  # set the digital instrument after instantiation
+  tester.digital_instrument = 'hsdmq'
+~~~
+
 % end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.49.3
+  version: 0.51.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -146,16 +146,16 @@ dependencies:
   name: sexpistol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.7
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -516,6 +516,7 @@ files:
 - pattern/tester_overlay.rb
 - pattern/tester_overlay_no_start.rb
 - pattern/tester_store.rb
+- pattern/uflex_digital_instrument.rb
 - program/_additional_erase.rb
 - program/_efa_resources.rb
 - program/_erase.rb
@@ -531,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
@@ -599,7 +601,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like