origen_testers 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b820efb12c6b6d04cc28d4a07dcea720c04766d4
-  data.tar.gz: 221fe0df2c7ce0bc25930e70a2bf460e71581667
+  metadata.gz: 1eb8eec2e4b2ea9b43e9f85db05a9e20a67e9fed
+  data.tar.gz: 364c16ce86593110cf00d77192b184f6134cfc31
 SHA512:
-  metadata.gz: f4ca994f2693db84f462eeb29317cb7ef93b7d897924dcbb5d2a5eae89d2644c6b2f6577754e4dba2792c968323e962ae939ebb61999916bf7a153ab43e87e51
-  data.tar.gz: 7676249acf0d9e6bc7365ce8bf80e36874bff97d18281841a97b6e7e21387677b9104fc9cc13b731eff52bc6c9bd27d309fbbaaeeb810494839db91d82e003d3
+  metadata.gz: 02288e643e51cc7828820ffed4d611a031f3cee0d5b7a4ba95701db4e56cd53624d96656ac1b8bbeb0e9d66daaa1365aaeb4130a0e7718dccecf4afa9fdc7575
+  data.tar.gz: d876aa27f74e159ebd21b66634529db508b71f3a3fd45121ab8da21b7fa3fb90fa4c53e0a4d32c1690829b4aef657a49497387f5bd9d97b84a8b1e7ca59eb8c7

data/config/version.rb

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

data/lib/origen_testers/igxl_based_tester/base.rb

@@ -7,6 +7,9 @@ module OrigenTesters
       attr_accessor :software_version
       attr_accessor :pattern_compiler_pinmap
       attr_accessor :memory_test_en
+      attr_accessor :testerconfig
+      attr_accessor :channelmap
+      attr_accessor :max_site
 
       # NOTE: DO NOT USE THIS CLASS DIRECTLY ONLY USED AS PARENT FOR
       # DESIRED TESTER CLASS
@@ -40,12 +43,95 @@ module OrigenTesters
         @min_pattern_vectors = 0  # no minimum
 
         @memory_test_en = false  # memory test enabled (for all patterns?)
+
+        @testerconfig ||= {}
+        @channelmap ||= {}
       end
 
       def igxl_based?
         true
       end
 
+      def import_tester_config(testconfigname, fullconfigpath)
+        # This function reads in CurrentConfig.txt file generated by IG-XL.
+        # testconfigname example ==> "FT", "WT", "Production"
+        # fullconfigpath example ==> "/product_folder/CurrentConfig.txt"
+
+        puts "importing Testerconfig #{testconfigname}..."
+        slotnum = Struct.new(:slot, :instrument, :idprom)
+        @testerconfig[testconfigname] ||= {}
+        current_config_file = Pathname.new(fullconfigpath)
+        File.open(current_config_file, 'r').each_line do |line|
+          if line =~ /^\d*.0/
+            (slot, blank1, instrument, blank2, idprom) = line.split(/\t/)
+            @testerconfig[testconfigname][slot.split('.').first.to_i] = slotnum.new(slot.split('.').first.to_i, instrument, idprom.chomp)
+          end
+        end
+      end
+
+      def get_tester_instrument(testconfigname, slot)
+        @testerconfig[testconfigname].each_with_index do |element, index|
+          if slot.to_s == element[0].to_s
+            return element[1][:instrument]
+          end
+        end
+        nil  # if no corresponding slot
+      end
+
+      def get_instrument_slots(testconfigname, instrument)  # testconfigname example "WT", "FT", "Production"
+        @slots = []
+        @testerconfig[testconfigname].each_with_index do |element, index|
+          if instrument.to_s == element[1][:instrument].to_s
+            @slots << element[0].to_i
+          end
+        end
+        @slots  # if no corresponding slot
+      end
+
+      def import_chanmap(chanmapname, fullchanmappath)
+        # This function reads IG-XL ChannelMap file
+        # chanmapname example ==> "FT", "WT", "FTX2"
+        # fullchanmappath example ==> "/product_folder/Chans_FT.txt"
+
+        puts "importing ChannelMap #{fullchanmappath}..."
+
+        chanassignment = Struct.new(:pinname, :site, :channel, :type, :packagepin)
+        chanmap_file = Pathname.new(fullchanmappath)
+        @channelmap[chanmapname] ||= {}
+        File.open(chanmap_file, 'r').each_line.with_index do |line, index|
+          if index == 0
+            unless line =~ /DTChanMap/
+              puts "#{fullchanmappath} is not a valid IG-XL ChannelMap!"
+              break
+            end
+          end
+          if index == 5
+            siteloc = line.split(/\t/).size - 2
+            @max_site_s = line.split(/\t/)[siteloc].split(/\s/)[1]
+            @max_site = @max_site_s.to_i
+            (0..@max_site).each do |sitenum|
+              @channelmap[chanmapname][sitenum] ||= {}
+            end
+          end
+          if index > 5
+            (blank1, pinname, packagepin, type) = line.split(/\t/)
+            (0..@max_site).each do |sitenum|
+              channel = line.split(/\t/)[4 + sitenum]
+              @channelmap[chanmapname][sitenum][pinname] = chanassignment.new(pinname, sitenum, channel.chomp, type, packagepin)
+            end
+          end
+        end
+      end
+
+      def get_tester_channel(chanmapname, pinname, sitenum)
+        if sitenum <= @max_site
+          @testerchannel = @channelmap[chanmapname][sitenum][pinname].channel
+          return @testerchannel
+        else
+          return nil
+        end
+      end
+
       def assign_dc_instr_pins(dc_pins)
         if !dc_pins.is_a?(Array)
           @dc_pins = [] << dc_pins

data/lib/origen_testers/test/dut.rb

@@ -21,11 +21,11 @@ module OrigenTesters
         add_pin :tdo
         add_pin :tms
 
-        add_reg32 :testme32, 0x007a do
-          bits 31..16, :portB
-          bits 15..8,  :portA
-          bits 1,      :done
-          bits 0,      :enable
+        reg :testme32, 0x007a do |reg|
+          reg.bits 31..16, :portB
+          reg.bits 15..8,  :portA
+          reg.bits 1,      :done
+          reg.bits 0,      :enable
         end
         @hv_supply_pin = 'VDDHV'
         @lv_supply_pin = 'VDDLV'

data/lib/origen_testers/test/dut2.rb

@@ -7,8 +7,8 @@ module OrigenTesters
         add_pin :reset,   reset: :drive_hi,  name: 'nvm_reset'
         add_pin :clk,     reset: :drive_hi,  name: 'nvm_clk'
         add_pin :clk_mux, reset: :drive_hi,  name: 'nvm_clk_mux'
-        add_port :porta,   reset: :drive_lo,  size: 8
-        add_port :portb,   reset: :drive_lo,  size: 8, endian: :little
+        add_pin :porta,   reset: :drive_lo,  size: 8
+        add_pin :portb,   reset: :drive_lo,  size: 8, endian: :little
         add_pin :invoke,  reset: :drive_lo,  name: 'nvm_invoke'
         add_pin :done,    reset: :expect_hi, name: 'nvm_done'
         add_pin :fail,    reset: :expect_lo, name: 'nvm_fail'
@@ -29,7 +29,7 @@ module OrigenTesters
         add_pin_alias :pa5, :porta, pin: 5
         add_pin_alias :pa_lower, :porta, pins: [3..0]
         add_pin_alias :pa_upper, :porta, pins: [7, 6, 5, 4]
-        add_port_alias :porta_alias, :porta
+        add_pin_alias :porta_alias, :porta
       end
 
       def startup(options)

data/lib/origen_testers/vector_pipeline.rb

@@ -212,7 +212,8 @@ module OrigenTesters
     # Calling this will compress the 2nd group into the 1st if possible
     def lead_group_finalized?
       if first_group_present? && second_group_present?
-        if second_group_is_duplicate_of_first_group? && first_group_repeat != $tester.max_repeat_loop
+        if second_group_is_duplicate_of_first_group? && first_group_repeat != $tester.max_repeat_loop &&
+           first_group_can_be_compressed?
           # Consume the second group by incrementing the first group repeat counter
           self.first_group_repeat = first_group_repeat + second_group_repeat
           # Delete the second group
@@ -256,6 +257,12 @@ module OrigenTesters
       second_group.last.repeat = val
     end
 
+    def first_group_can_be_compressed?
+      first_group.all? do |vector|
+        !vector.dont_compress
+      end
+    end
+
     def second_group_is_duplicate_of_first_group?
       i = -1
       second_group.all? do |vector|

data/pattern/nvm/j750/j750_halt.rb

@@ -14,11 +14,11 @@ Pattern.create(:end_with_halt => true) do
 
   ss 'Test that basic port manipulation works'
   unless $tester.respond_to?('hpt_mode')
-    $nvm.port(:porta).drive(0x55)
+    $nvm.pins(:porta).drive(0x55)
     $tester.cycle
-    $nvm.port(:porta).expect(0xAA)
+    $nvm.pins(:porta).expect(0xAA)
     $tester.cycle
-    $nvm.port(:porta)[1].dont_care
+    $nvm.pins(:porta)[1].dont_care
     $tester.cycle
   end
 
@@ -88,17 +88,17 @@ Pattern.create(:end_with_halt => true) do
   if !$tester.respond_to?('hpt_mode')
     ss 'Test looping, these vectors should be executed once'
     $tester.loop_vector('test_loop_1', 1) do
-      $nvm.port(:porta).drive(0xAA)
+      $nvm.pins(:porta).drive(0xAA)
       $tester.cycle
-      $nvm.port(:porta).drive(0x55)
+      $nvm.pins(:porta).drive(0x55)
       $tester.cycle
     end
 
     ss 'Test looping, these vectors should be executed 3 times'
     $tester.loop_vector('test_loop_2', 3) do
-      $nvm.port(:porta).drive(0xAA)
+      $nvm.pins(:porta).drive(0xAA)
       $tester.cycle
-      $nvm.port(:porta).drive(0x55)
+      $nvm.pins(:porta).drive(0x55)
       $tester.cycle
     end
   else

data/pattern/nvm/j750/j750_workout.rb

@@ -14,21 +14,21 @@ Pattern.create do
 
   unless $tester.respond_to?('hpt_mode')
     ss 'Test that the port API works'
-    $nvm.port(:porta).drive(0x55)
+    $nvm.pins(:porta).drive(0x55)
     $tester.cycle
-    $nvm.port(:porta).expect(0xAA)
+    $nvm.pins(:porta).expect(0xAA)
     $tester.cycle
-    $nvm.port(:porta).drive!(0x55)
-    $nvm.port(:porta).dont_care!
-    $nvm.port(:porta).drive_hi!
-    $nvm.port(:porta).drive_very_hi!
-    $nvm.port(:porta).drive_lo!
-    $nvm.port(:porta).assert_hi!
-    $nvm.port(:porta).assert_lo!
-    $nvm.port(:porta).drive_lo
-    $nvm.port(:porta)[1].assert(1)
-    $nvm.port(:porta)[2].assert!(1)
-    $nvm.port(:porta).drive_lo
+    $nvm.pins(:porta).drive!(0x55)
+    $nvm.pins(:porta).dont_care!
+    $nvm.pins(:porta).drive_hi!
+    $nvm.pins(:porta).drive_very_hi!
+    $nvm.pins(:porta).drive_lo!
+    $nvm.pins(:porta).assert_hi!
+    $nvm.pins(:porta).assert_lo!
+    $nvm.pins(:porta).drive_lo
+    $nvm.pins(:porta)[1].assert(1)
+    $nvm.pins(:porta)[2].assert!(1)
+    $nvm.pins(:porta).drive_lo
   end
 
   ss 'Test that the store method works'
@@ -107,25 +107,25 @@ Pattern.create do
   unless $tester.respond_to?('hpt_mode')
     ss 'Test looping, these vectors should be executed once'
     $tester.loop_vector('test_loop_1', 1) do
-      $nvm.port(:porta).drive(0xAA)
+      $nvm.pins(:porta).drive(0xAA)
       $tester.cycle
-      $nvm.port(:porta).drive(0x55)
+      $nvm.pins(:porta).drive(0x55)
       $tester.cycle
     end
 
     ss 'Test looping, these vectors should be executed 3 times'
     $tester.loop_vector('test_loop_2', 3) do
-      $nvm.port(:porta).drive(0xAA)
+      $nvm.pins(:porta).drive(0xAA)
       $tester.cycle
-      $nvm.port(:porta).drive(0x55)
+      $nvm.pins(:porta).drive(0x55)
       $tester.cycle
     end
 
     ss 'Test looping with label first, these vectors should be executed 3 times'
     $tester.loop_vector('test_loop_2', 3, false, true) do
-      $nvm.port(:porta).drive(0xAA)
+      $nvm.pins(:porta).drive(0xAA)
       $tester.cycle
-      $nvm.port(:porta).drive(0x55)
+      $nvm.pins(:porta).drive(0x55)
       $tester.cycle
     end
   end
@@ -179,13 +179,13 @@ Pattern.create do
 
     unless $tester.respond_to?('hpt_mode')
       ss 'Test memory test port states'
-      $nvm.port(:porta).drive_mem
+      $nvm.pins(:porta).drive_mem
       $tester.cycle
-      $nvm.port(:porta).drive_mem!
-      $nvm.port(:porta).expect_mem
+      $nvm.pins(:porta).drive_mem!
+      $nvm.pins(:porta).expect_mem
       $tester.cycle
-      $nvm.port(:porta).expect_mem!
-      $nvm.port(:porta).drive!(0x0)
+      $nvm.pins(:porta).expect_mem!
+      $nvm.pins(:porta).drive!(0x0)
     end
   end
 
@@ -199,4 +199,11 @@ Pattern.create do
   Origen.tester.cycle(:repeat => 60000)
   Origen.tester.cycle(:repeat => 60000)
   Origen.tester.cycle(:repeat => 60000)
+
+  ss 'Test real life case where dont compress was ignored'
+  tester.label("my_label_1")
+  $nvm.pins(:porta).drive(0x55)
+  tester.cycle(dont_compress: true)
+  tester.cycle(repeat: 200)
+  $nvm.pins(:porta).drive!(0)
 end

data/pattern/nvm/v93k/v93k_workout.rb

@@ -12,18 +12,18 @@ Pattern.create do
   end
 
   ss "Test that the port API works"
-  $nvm.port(:porta).drive(0x55)
+  $nvm.pins(:porta).drive(0x55)
   $tester.cycle
-  $nvm.port(:porta).expect(0xAA)
+  $nvm.pins(:porta).expect(0xAA)
   $tester.cycle
-  $nvm.port(:porta).drive!(0x55)
-  $nvm.port(:porta).dont_care!
-  $nvm.port(:porta).drive_hi!
-  $nvm.port(:porta).drive_very_hi!
-  $nvm.port(:porta).drive_lo!
-  $nvm.port(:porta).assert_hi!
-  $nvm.port(:porta).assert_lo!
-  $nvm.port(:porta).drive_lo
+  $nvm.pins(:porta).drive!(0x55)
+  $nvm.pins(:porta).dont_care!
+  $nvm.pins(:porta).drive_hi!
+  $nvm.pins(:porta).drive_very_hi!
+  $nvm.pins(:porta).drive_lo!
+  $nvm.pins(:porta).assert_hi!
+  $nvm.pins(:porta).assert_lo!
+  $nvm.pins(:porta).drive_lo
 
   ss "Test that the store method works"
   cc "This vector should capture the FAIL pin data"
@@ -34,7 +34,7 @@ Pattern.create do
   $tester.cycle
   $tester.cycle
   $tester.cycle
-  $tester.store $nvm.pin(:fail), $nvm.port(:porta), :offset => -2
+  $tester.store $nvm.pin(:fail), $nvm.pins(:porta), :offset => -2
   $tester.cycle
   $tester.store_next_cycle $nvm.pin(:fail)
   cc "This vector should capture the FAIL pin data"
@@ -74,25 +74,25 @@ Pattern.create do
 
   ss "Test looping, these vectors should be executed once"
   $tester.loop_vector("test_loop_1", 1) do
-    $nvm.port(:porta).drive(0xAA)
+    $nvm.pins(:porta).drive(0xAA)
     $tester.cycle
-    $nvm.port(:porta).drive(0x55)
+    $nvm.pins(:porta).drive(0x55)
     $tester.cycle
   end
 
   ss "Test looping, these vectors should be executed 3 times"
   $tester.loop_vector("test_loop_2", 3) do
-    $nvm.port(:porta).drive(0xAA)
+    $nvm.pins(:porta).drive(0xAA)
     $tester.cycle
-    $nvm.port(:porta).drive(0x55)
+    $nvm.pins(:porta).drive(0x55)
     $tester.cycle
   end
 
   ss "Test looping, these vectors should be executed 5 times"
   $tester.loop_vectors 5 do
-    $nvm.port(:porta).drive(0xAA)
+    $nvm.pins(:porta).drive(0xAA)
     $tester.cycle
-    $nvm.port(:porta).drive(0x55)
+    $nvm.pins(:porta).drive(0x55)
     $tester.cycle
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -42,14 +42,14 @@ dependencies:
   name: origen_arm_debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.3
 - !ruby/object:Gem::Dependency