origen_testers 0.7.0.pre0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90943f4feeb9a5fd74e0660e8bbbc068d2b0aa0
-  data.tar.gz: 0d0334819d9b766a4030e712ae4070074262b350
+  metadata.gz: d897e6581771bc27d333380a7268dd24f5823c11
+  data.tar.gz: 9320f4f545dba6122cfc142da034818a5ef8856c
 SHA512:
-  metadata.gz: 9813effc8d620fe3b6279b88d6ad0176449cb31712f0cfd4789fbc22005f1ea3f1c86fcd001f988189b2717fe9999c22d1ba462bb157638f1e207bcf881acba6
-  data.tar.gz: 8f480ad0212eb967200d833ea721ed7d002326a6b7a08988b794afe379ee0766c3debdb8061d6844bd910f389675a62916a46526140e360ff2277140662e42a5
+  metadata.gz: 440ddc17e513453c7611976fa25e2f310368d5fe7f409b3077d80354f3e21d8bbfe38631dff4322247b7b61417bbdd6967d0c98ca490b70acb0f5aff3ee868aa
+  data.tar.gz: 90bd5c77657cb3c31cda3b098ee0db03f68fb017a9796cb1cd49c8d8b5301ad4e7fb3b3db253d85614ae4c9607ffdfe793471bfd5834889a2a31b696e16a3c51

data/config/version.rb

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

data/lib/origen_testers/igxl_based_tester/base.rb

@@ -267,6 +267,7 @@ module OrigenTesters
         options = { offset: 0
                   }.merge(options)
         update_vector microcode: 'stv', offset: options[:offset]
+        last_vector(options[:offset]).contains_capture = true
       end
       alias_method :to_hram, :store
       alias_method :capture, :store
@@ -285,10 +286,18 @@ module OrigenTesters
         options = pins.last.is_a?(Hash) ? pins.pop : {}
         options = {
         }.merge(options)
-        preset_next_vector microcode: 'stv'
+        preset_next_vector microcode: 'stv' do |vector|
+          vector.contains_capture = true
+        end
       end
       alias_method :store!, :store_next_cycle
 
+      # @api private
+      def remove_store_from_vector(vector)
+        super
+        vector.microcode = nil
+      end
+
       # Call a subroutine.
       #
       # This method applies a call subroutine opcode to the previous vector, it does not

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -69,6 +69,7 @@ module OrigenTesters
             pin.capture
             update_vector_pin_val pin, offset: options[:offset]
             last_vector(options[:offset]).dont_compress = true
+            last_vector(options[:offset]).contains_capture = true
           end
         end
       end
@@ -95,7 +96,8 @@ module OrigenTesters
         pins.each { |pin| pin.save; pin.capture }
         # Register this clean up function to be run after the next vector
         # is generated, cool or what!
-        preset_next_vector do
+        preset_next_vector do |vector|
+          vector.contains_capture = true
           pins.each(&:restore)
         end
       end

data/lib/origen_testers/vector.rb

@@ -3,7 +3,7 @@ module OrigenTesters
   class Vector
     attr_accessor :repeat, :microcode, :timeset, :pin_vals,
                   :number, :cycle_number, :dont_compress,
-                  :comments, :inline_comment, :cycle, :number
+                  :comments, :inline_comment, :cycle, :number, :contains_capture
 
     def initialize(attrs = {})
       @inline_comment = ''
@@ -73,7 +73,9 @@ module OrigenTesters
         if timeset.period_in_ns % tset.period_in_ns != 0
           fail "The period of timeset #{timeset.name} is not a multiple of the period of timeset #{tset.name}!"
         end
-        if $tester.timing_toggled_pins.empty?
+        if contains_capture
+          vector_modification_required = true
+        elsif $tester.timing_toggled_pins.empty?
           vector_modification_required = false
         else
           # If the timing toggled pins are not driving on this vector, then no
@@ -102,6 +104,7 @@ module OrigenTesters
             v = dup
             v.repeat = 1
             v.pin_vals = inhibit_compares
+            $tester.remove_store_from_vector(v) if v.contains_capture
             yield v
             # Then drive the pin 'off' value for the remainder
             v = dup
@@ -110,6 +113,7 @@ module OrigenTesters
               v = dup
               v.repeat = r - 1
               pin_values.each { |vals| v.set_pin_value(vals[:pin], vals[:off]) if vals }
+              $tester.remove_store_from_vector(v) if v.contains_capture
               yield v
             end
             v = dup

data/lib/origen_testers/vector_generator.rb

@@ -229,11 +229,12 @@ module OrigenTesters
           end
           @preset_next_vector = nil
         end
+        v = Vector.new(attrs)
         stage.store Vector.new(attrs)
         inc_vec_count
         inc_cycle_count(attrs[:repeat] || 1)
         if @preset_next_vector_cleanup
-          @preset_next_vector_cleanup.call
+          @preset_next_vector_cleanup.call(v)
           @preset_next_vector_cleanup = nil
         end
       end
@@ -636,5 +637,10 @@ module OrigenTesters
         @dont_care_state || 'X'
       end
     end
+
+    # @api private
+    def remove_store_from_vector(vector)
+      vector.pin_vals.sub!('C', 'X')
+    end
   end
 end

data/pattern/multi_vector.rb

@@ -84,6 +84,11 @@ SetupTester.new
     8.cycles
     $tester.set_timeset("nvmbist_readout", 160)
     8.cycles
+    ss "Test that additional stores are not injected, only 4 TDO vectors should be captured"
+    4.times do
+      1.cycle
+      $tester.store($dut.pin(:tdo))
+    end
     $dut.pin(:tdo).dont_care
     $tester.set_timeset("nvmbist", 40)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre0
+  version: 0.7.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-23 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.2.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like