origen_testers 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d897e6581771bc27d333380a7268dd24f5823c11
-  data.tar.gz: 9320f4f545dba6122cfc142da034818a5ef8856c
+  metadata.gz: 13097c4540ddc2298b5549c3edc445f71285b5fa
+  data.tar.gz: cc7bad70792a9de4bee7a303fa90c031eab2a4bf
 SHA512:
-  metadata.gz: 440ddc17e513453c7611976fa25e2f310368d5fe7f409b3077d80354f3e21d8bbfe38631dff4322247b7b61417bbdd6967d0c98ca490b70acb0f5aff3ee868aa
-  data.tar.gz: 90bd5c77657cb3c31cda3b098ee0db03f68fb017a9796cb1cd49c8d8b5301ad4e7fb3b3db253d85614ae4c9607ffdfe793471bfd5834889a2a31b696e16a3c51
+  metadata.gz: 0082db3b24571cdf255686fc76f7211c08dd3c29197b4eebb644af6554f63591a9de56934af76783caa8eb6b1d520fb03fb55b4ffd38a3346fcd1e478cd09594
+  data.tar.gz: f124fa94f903803406816de277cd877406722ee518c3cdd9b52798de2b6b2135ed9e82a251aa3467fdb70838602048089cdf3ec199e8308e454cee3e86bfa8f4

data/config/version.rb

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

data/lib/origen_testers/igxl_based_tester/base.rb

@@ -11,7 +11,7 @@ module OrigenTesters
       attr_accessor :channelmap
       attr_accessor :default_channelmap
       attr_accessor :default_testerconfig
-
+      attr_accessor :max_site
       # NOTE: DO NOT USE THIS CLASS DIRECTLY ONLY USED AS PARENT FOR
       # DESIRED TESTER CLASS
 
@@ -717,7 +717,7 @@ module OrigenTesters
         $tester.align_to_last
         # cycle(:microcode => "#{$dut.end_of_pattern_label}:") if $dut.end_of_pattern_label
         if options[:end_in_ka]
-          $tester.cycle microcode: 'keep_alive'
+          $tester.cycle microcode: "#{@microcode[:keepalive]}"
         else
           if options[:end_with_halt]
             $tester.cycle microcode: 'halt'

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

@@ -69,31 +69,6 @@ module OrigenTesters
           end
         end
 
-        # Returns a hash containing key meta data about the test instance, this is
-        # intended to be used in documentation
-        def to_meta
-          m = { 'Test' => name,
-                'Type' => type
-          }
-          if type == :functional
-            m['Pattern'] = pattern
-          elsif type == :board_pmu || type == :pin_pmu
-            m['Measure'] = fvmi? ? 'current' : 'voltage'
-            if hi_lo_limit_valid & 2 != 0
-              m['Hi'] = hi_limit
-            end
-            if hi_lo_limit_valid & 1 != 0
-              m['Lo'] = lo_limit
-            end
-            if force_cond
-              m['Force'] = force_cond
-            end
-          end
-          m['DC'] = "#{dc_category} (#{dc_selector})"
-          m['AC'] = "#{ac_category} (#{ac_selector})"
-          m.merge(@meta)
-        end
-
         def inspect
           "<TestInstance: #{name}, Type: #{type}>"
         end
@@ -174,26 +149,11 @@ module OrigenTesters
           fail 'The #{self.class} class has not defined a set_wait_flags method!'
         end
 
-        # Set and enable the pre-charge voltage of a parametric test instance.
-        def set_pre_charge(val)
-          if val
-            self.pre_charge_enable = 1
-            self.pre_charge = val
-          else
-            self.pre_charge_enable = 0
-          end
-          self
-        end
-        alias_method :set_precharge, :set_pre_charge
-
         # Set and enable the hi limit of a parametric test instance, passing in
         # nil or false as the lim parameter will disable the hi limit.
         def set_hi_limit(lim)
           if lim
-            self.hi_lo_limit_valid = hi_lo_limit_valid | 2
             self.hi_limit = lim
-          else
-            self.hi_lo_limit_valid = hi_lo_limit_valid & 1
           end
           self
         end
@@ -203,10 +163,7 @@ module OrigenTesters
         # nil or false as the lim parameter will disable the hi limit.
         def set_lo_limit(lim)
           if lim
-            self.hi_lo_limit_valid = hi_lo_limit_valid | 1
             self.lo_limit = lim
-          else
-            self.hi_lo_limit_valid = hi_lo_limit_valid & 2
           end
           self
         end
@@ -330,19 +287,6 @@ module OrigenTesters
           self
         end
 
-        # Set the meaure mode of a parametric test instance, either:
-        # * :voltage / :fimv
-        # * :current / :fvmi
-        def set_measure_mode(mode)
-          if mode == :current || mode == :fvmi
-            self.measure_mode = 0
-          elsif mode == :voltage || mode == :fimv
-            self.measure_mode = 1
-          else
-            fail "Unknown measure mode: #{mode}"
-          end
-        end
-
         # Returns true if instance configured for force current, measure voltage
         def fimv?
           measure_mode == 1

data/lib/origen_testers/igxl_based_tester/j750.rb

@@ -40,6 +40,7 @@ module OrigenTesters
         @microcode[:enable] = 'enable'
         @microcode[:set_flag] = 'set_cpu'
         @microcode[:mask_vector] = 'ign ifc icc'
+        @microcode[:keepalive] = 'keep_alive'
       end
 
       def pattern_header(options = {})

data/lib/origen_testers/igxl_based_tester/j750/test_instance.rb

@@ -541,6 +541,92 @@ module OrigenTesters
           self.wait_flags = d + c + b + a
           self
         end
+
+        # Set and enable the pre-charge voltage of a parametric test instance.
+        def set_pre_charge(val)
+          if val
+            self.pre_charge_enable = 1
+            self.pre_charge = val
+          else
+            self.pre_charge_enable = 0
+          end
+          self
+        end
+        alias_method :set_precharge, :set_pre_charge
+
+        # Returns a hash containing key meta data about the test instance, this is
+        # intended to be used in documentation
+        def to_meta
+          m = { 'Test' => name,
+                'Type' => type
+          }
+          if type == :functional
+            m['Pattern'] = pattern
+          elsif type == :board_pmu || type == :pin_pmu
+            m['Measure'] = fvmi? ? 'current' : 'voltage'
+            if hi_lo_limit_valid & 2 != 0
+              m['Hi'] = hi_limit
+            end
+            if hi_lo_limit_valid & 1 != 0
+              m['Lo'] = lo_limit
+            end
+            m['Hi'] = hi_limit
+            m['Lo'] = lo_limit
+            if force_cond
+              m['Force'] = force_cond
+            end
+          end
+          m['DC'] = "#{dc_category} (#{dc_selector})"
+          m['AC'] = "#{ac_category} (#{ac_selector})"
+          m.merge(@meta)
+        end
+
+        # Set the meaure mode of a parametric test instance, either:
+        # * :voltage / :fimv
+        # * :current / :fvmi
+        def set_measure_mode(mode)
+          if mode == :current || mode == :fvmi
+            self.measure_mode = 0
+          elsif mode == :voltage || mode == :fimv
+            self.measure_mode = 1
+          else
+            fail "Unknown measure mode: #{mode}"
+          end
+        end
+
+        # Set and enable the hi limit of a parametric test instance, passing in
+        # nil or false as the lim parameter will disable the hi limit.
+        def set_hi_limit(lim)
+          if lim
+            if $tester.j750?
+              self.hi_lo_limit_valid = hi_lo_limit_valid | 2
+            end
+            self.hi_limit = lim
+          else
+            if $tester.j750?
+              self.hi_lo_limit_valid = hi_lo_limit_valid & 1
+            end
+          end
+          self
+        end
+        alias_method :hi_limit=, :set_hi_limit
+
+        # Set and enable the hi limit of a parametric test instance, passing in
+        # nil or false as the lim parameter will disable the hi limit.
+        def set_lo_limit(lim)
+          if lim
+            if $tester.j750?
+              self.hi_lo_limit_valid = hi_lo_limit_valid | 1
+            end
+            self.lo_limit = lim
+          else
+            if $tester.j750?
+              self.hi_lo_limit_valid = hi_lo_limit_valid & 2
+            end
+          end
+          self
+        end
+        alias_method :lo_limit=, :set_lo_limit
       end
     end
   end

data/lib/origen_testers/igxl_based_tester/ultraflex.rb

@@ -38,6 +38,9 @@ module OrigenTesters
         @digital_instrument = 'hsdm' # 'hsdm' for HSD1000 and UP800, ok with UP1600 though
 
         @capture_state = 'V'            # STV requires valid 'V' expect data
+
+        @set_msb_issued = false        # Internal flag to keep track of set_msb usage, allowing for set_lsb to be used as a readcode
+        @microcode[:keepalive] = 'keepalive'
       end
 
       def freq_count(pin, options = {})
@@ -124,12 +127,51 @@ module OrigenTesters
       end
 
       def call_match
-        fail 'Method call_match not yet supported for UltraFLEX!'
+        #        fail 'Method call_match not yet supported for UltraFLEX!'
+        @match_counter = @match_counter || 0
+        call_subroutine("match_done_#{@match_counter}")
+        @match_counter += 1 unless @match_counter == (@match_entries || 1) - 1
+      end
+
+      # Ultraflex implementation of J750-style 'set_code'
+      #
+      # Set a readcode, using one of the Ultraflex general-purpose counters.
+      # Counter C15 is used by default, this can be changed by the caller if necessary.
+      #
+      # Use to set an explicit readcode for communicating with the tester. This method
+      # will generate an additional vector (or 2, depending if set_msb is needed).
+      #
+      # NOTE: Some caveats when using this method:
+      #   - When setting a counter from the pattern microcode, the actual Patgen counter value is set to n-1.
+      #     This method adjusts by using a value of n+1, so the value read by the tester is the original intended value.
+      #
+      #   - When setting a counter from pattern microcode, the upper bits must be loaded separately using 'set_msb'.
+      #     This method calls the set_msb opcode if needed - note the tester must mask the upper 16 bits to get the desired value.
+      #     The set_msb opcode will also generate a second vector the first time the set_code method is called.
+      #
+      # ==== Examples
+      #   $tester.set_code(55)
+      #
+      def set_code(*code)
+        options = code.last.is_a?(Hash) ? code.pop : {}
+        options = { counter: 'c15'
+                  }.merge(options)
+        cc " Using counter #{options[:counter]} as set_code replacement - value set to #{code[0]} + 1"
+        unless @set_msb_issued
+          set_msb(1)
+          cycle   # set_msb doesn't issue a cycle
+        end
+        cycle(microcode: "set #{options[:counter]} #{code[0].next}")   #+1 here to align with VBT
       end
 
-      def set_code(code)
-        Origen.log.warning 'Method set_code not supported for UltraFLEX! Find alternative solution.'
-        cc '*** WARNING! *** Method set_code not supported for UltraFLEX! Find alternative solution.'
+      def set_code_no_msb(*code)
+        options = code.last.is_a?(Hash) ? code.pop : {}
+        options = { counter: 'c15'
+                  }.merge(options)
+        unless @set_msb_issued
+          cycle   # set_msb doesn't issue a cycle
+        end
+        cycle(microcode: "set #{options[:counter]} #{code[0].next}")   #+1 here to align with VBT
       end
 
       def loop_vectors(name, number_of_loops, global = false, label_first = false)
@@ -189,7 +231,6 @@ module OrigenTesters
         options[:dc_pins] = get_dc_instr_pins
         options[:digsrc_pins] = get_digsrc_pins
         options[:digcap_pins] = get_digcap_pins
-
         if options[:dc_pins]
           options[:dc_pins].each do |pin|
             options[:instruments].merge!(pin => 'DCVS')
@@ -292,11 +333,11 @@ module OrigenTesters
           fail 'ERROR: block not passed to match_block!'
         end
 
-        if options[:check_for_fails]
-          cc 'NOTE: check for fails prior to match loop not necessary on UltraFlex'
-        end
+        #        if options[:check_for_fails]
+        #          cc 'NOTE: check for fails prior to match loop not necessary on UltraFlex'
+        #        end
 
-        ss 'WARNING: MATCH LOOP FOR ULTRAFLEX STILL UNDER DEVELOPMENT'
+        #        ss 'WARNING: MATCH LOOP FOR ULTRAFLEX STILL UNDER DEVELOPMENT'
 
         # Create BlockArgs objects in order to receive multiple blocks
         match_conditions = Origen::Utility::BlockArgs.new
@@ -311,6 +352,23 @@ module OrigenTesters
           fail_conditions.add(&block)
         end
 
+        if options[:check_for_fails]
+          if options[:multiple_entries]
+            @match_entries.times do |i|
+              microcode "global subr match_done_#{i}:"
+              set_code(i + 100)
+              cycle(microcode: 'jump call_tester') unless i == @match_entries - 1
+            end
+            microcode 'call_tester:'
+          else
+            set_code(100)
+          end
+          cc 'Wait for any prior failures to propagate through the pipeline'
+          cycle(microcode: 'pipe_minus 1')
+          cc 'Now handshake with the tester to bin out and parts that have failed before they got here'
+          handshake(manual_stop: options[:manual_stop])
+        end
+
         # Now do the main match loop
         cc 'Start the match loop'
 
@@ -450,7 +508,8 @@ module OrigenTesters
       #   $tester.store(:offset => -2) # Just realized I need to capture that earlier vector
       def store(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = { offset: 0
+        options = { offset: 0,
+                    opcode: 'stv'
                   }.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
@@ -459,8 +518,8 @@ module OrigenTesters
         pins.each do |pin|
           pin.restore_state do
             pin.capture
-            update_vector microcode: 'stv', offset: options[:offset]
-            update_vector_pin_val pin, microcode: 'stv', offset: options[:offset]
+            update_vector microcode: options[:opcode], offset: options[:offset]
+            update_vector_pin_val pin, microcode: options[:opcode], offset: options[:offset]
             last_vector(options[:offset]).dont_compress = true
           end
         end
@@ -472,8 +531,8 @@ module OrigenTesters
         microcode "reload #{name}"
       end
 
-      def set_msb(name)
-        microcode "set_msb #{name}"
+      def set_msb(integer)
+        microcode "set_msb #{integer}"
       end
 
       # Capture the next vector generated to HRAM
@@ -490,6 +549,7 @@ module OrigenTesters
       def store_next_cycle(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
         options = {
+          opcode: 'stv'
         }.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
@@ -498,7 +558,7 @@ module OrigenTesters
         pins.each { |pin| pin.save; pin.capture }
         # Register this clean up function to be run after the next vector
         # is generated (SMcG: cool or what! DH: Yes, very cool!)
-        preset_next_vector(microcode: 'stv') do
+        preset_next_vector(microcode: options[:opcode]) do
           pins.each(&:restore)
         end
       end

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

@@ -5,7 +5,7 @@ module OrigenTesters
       class CustomTestInstance < Base::CustomTestInstance
         # Give all UltraFLEX test instances the ability to contain limits, these will
         # be rendered to Use-limit lines in the flow
-        attr_accessor :lo_limit, :hi_limit, :scale, :units, :defer_limits
+        attr_accessor :lo_limit, :hi_limit, :scale, :units, :defer_limits, :lo, :hi
 
         # Attributes for each test instance line, first few are named directly
         TEST_INSTANCE_ATTRS = %w(

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

@@ -10,7 +10,7 @@ module OrigenTesters
         def on_test(node)
           super
           ins = node.find(:object).value
-          if ins.respond_to?(:lo_limit) && (ins.lo_limit || ins.hi_limit)
+          if ins.respond_to?(:lo_limit) && (ins.lo_limit || ins.hi_limit) || ins.respond_to?(:lo) && (ins.lo || ins.hi)
             if ins.defer_limits
               completed_lines.last.opcode = 'Test-defer-limits'
             end
@@ -18,10 +18,19 @@ module OrigenTesters
             limit.type = :use_limit
             limit.opcode = 'Use-Limit'
             limit.parameter = nil
-
-            lo = ins.lo_limit
-            hi = ins.hi_limit
-
+            if ins.respond_to?(:lo_limit)
+              lo = ins.lo_limit
+              hi = ins.hi_limit
+              if lo.nil?
+                lo = ins.lo
+              end
+              if hi.nil?
+                hi = ins.hi
+              end
+            elsif ins.respond_to?(:lo)
+              lo = ins.lo
+              hi = ins.hi
+            end
             size = 1
             if lo.is_a?(Array)
               size = lo.size if lo.size > size
@@ -52,9 +61,11 @@ module OrigenTesters
                   s = ins.scale
                 end
               else
-                s = lowest_scale(scale_of(l), scale_of(h))
-                l = scaled(l, s)
-                h = scaled(h, s)
+                unless $tester.ultraflex?
+                  s = lowest_scale(scale_of(l), scale_of(h))
+                  l = scaled(l, s)
+                  h = scaled(h, s)
+                end
               end
               line.lolim = l
               line.hilim = h

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

@@ -12,7 +12,7 @@ module OrigenTesters
 
         # Give all UltraFLEX test instances the ability to contain limits, these will
         # be rendered to Use-limit lines in the flow
-        attr_accessor :lo_limit, :hi_limit, :scale, :units, :defer_limits
+        attr_accessor :lo_limit, :hi_limit, :scale, :units, :defer_limits, :lo, :hi
 
         # Attributes for additional test instance arguments beyond those described above
         TEST_INSTANCE_EXTRA_ARGS = 130
@@ -268,6 +268,46 @@ module OrigenTesters
           self.wait_flag4 = d
           self
         end
+
+        # Set and enable the pre-charge voltage of a parametric test instance.
+        def set_pre_charge(val)
+          self
+        end
+        alias_method :set_precharge, :set_pre_charge
+
+        # Returns a hash containing key meta data about the test instance, this is
+        # intended to be used in documentation
+        def to_meta
+          m = { 'Test' => name,
+                'Type' => type
+          }
+          if type == :functional
+            m['Pattern'] = pattern
+          elsif type == :board_pmu || type == :pin_pmu
+            m['Measure'] = fvmi? ? 'current' : 'voltage'
+            m['Hi'] = hi_limit
+            m['Lo'] = lo_limit
+            if force_cond
+              m['Force'] = force_cond
+            end
+          end
+          m['DC'] = "#{dc_category} (#{dc_selector})"
+          m['AC'] = "#{ac_category} (#{ac_selector})"
+          m.merge(@meta)
+        end
+
+        # Set the meaure mode of a parametric test instance, either:
+        # * :voltage / :fimv
+        # * :current / :fvmi
+        def set_measure_mode(mode)
+          if mode == :current || mode == :fvmi
+            self.measure_mode = 2
+          elsif mode == :voltage || mode == :fimv
+            self.measure_mode = 1
+          else
+            fail "Unknown measure mode: #{mode}"
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like