origen_testers 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6023b80a1b6acff09fb009dfe06653086cde1101
-  data.tar.gz: 7983d124ed3453e03611bbe18c311e1478d4d837
+  metadata.gz: 2ede4a79072352c2cd7d6acaa9fb865179f17316
+  data.tar.gz: 7af62afb233b4363fac108e8ddcbf64f862e33a4
 SHA512:
-  metadata.gz: 7048fcf4fa639db5f22bfc616e4bab64168dbd551ea44f079b624245c9d1b23929d53548eebea074b9a6eece440753584b312a7be776ce34087cfe55742219bd
-  data.tar.gz: 60e493228741d4c898014d1c85a91957f2a2c32fe42319a87665283d84d912c419aba44ef226f03e837b3977d3b7aa23126b96428541a2bedd64c870453b90cc
+  metadata.gz: 65ef5f42b2f18f4d7b6f5218af23f762eb3d3b1687b635e4e39866e2da8e0d03ac99c5e104c71f9a885e92732fa9cf589462eba8fb00eff6d6c1c2d8643d3e98
+  data.tar.gz: a2086e85641e434028486e4313b01ad4efa37959a36cbda1ff4b00c5aea2017e3ef931e4cde098506994471082bb73dd9a875d84f3fa7b37009cff107d9592ab

data/config/version.rb

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

data/lib/origen_testers/igxl_based_tester/base.rb

@@ -43,13 +43,41 @@ module OrigenTesters
       end
 
       def assign_dc_instr_pins(dc_pins)
-        @dc_pins = dc_pins
+        if !dc_pins.is_a?(Array)
+          @dc_pins = [] << dc_pins
+        else
+          @dc_pins = dc_pins
+        end
+      end
+
+      def assign_digsrc_pins(digsrc_pins)
+        if !digsrc_pins.is_a?(Array)
+          @digsrc_pins = [] << digsrc_pins
+        else
+          @digsrc_pins = digsrc_pins
+        end
+      end
+
+      def assign_digcap_pins(digcap_pins)
+        if !digcap_pins.is_a?(Array)
+          @digcap_pins = [] << digcap_pins
+        else
+          @digcap_pins = digcap_pins
+        end
       end
 
       def get_dc_instr_pins
         @dc_pins
       end
 
+      def get_digsrc_pins
+        @digsrc_pins
+      end
+
+      def get_digcap_pins
+        @digcap_pins
+      end
+
       def flows
         parser.flows
       end
@@ -489,11 +517,15 @@ module OrigenTesters
         # Take care of any instruments
         if options[:instruments].length > 0
           microcode 'instruments = {'
-          options[:instruments].each do |instrument, setting|
-            if "#{setting}" == 'nil'
+          options[:instruments].each do |pins, instrument|
+            if "#{pins}" == 'nil'
               microcode "               #{instrument};"
+            elsif instrument == 'digsrc'
+              microcode "               #{pins}:#{instrument} #{options[:digsrc_width]}:#{options[:digsrc_bit_order]}:#{options[:digsrc_mode]}:format=#{options[:digsrc_format]}:#{options[:digsrc_site_uniqueness]}:#{options[:digsrc_auto_cond]};"
+            elsif instrument == 'digcap'
+              microcode "               #{pins}:#{instrument} #{options[:digcap_width]}:#{options[:digcap_bit_order]}:#{options[:digcap_mode]}:format=#{options[:digcap_format]}:data_type=#{options[:digcap_data_type]}:#{options[:digcap_auto_cond]}:#{options[:digcap_auto_trig_enable]}:#{options[:digcap_store_stv]}:#{options[:digcap_receive_data]};"
             else
-              microcode "               #{instrument}:#{setting};"
+              microcode "               #{pins}:#{instrument};"
             end
           end
           microcode '}'
@@ -635,6 +667,90 @@ module OrigenTesters
         end
       end
 
+      # Call this method at the start of any digsrc overlay operations, this method
+      # takes care of all the microcodes and delays that's needed for digsrc overlay
+      # Required arguments:
+      #                     pins
+      # Optionsal arguments:
+      #                     options[:dssc_mode] = :single or :dual, anything else wil be
+      #                     treated as if it's operating in :quad mode
+      def digsrc_start(pins, options = {})
+        options = {
+          dssc_mode: :single # defaults dssc_mode to single mode
+        }.merge(options)
+        if pins.size > 1
+          microcode "((#{format_multiple_instrument_pins(pins)}):DigSrc = Start)"
+        else
+          microcode "((#{pin}):DigSrc = Start)"
+        end
+        if options[:dssc_mode] == :single
+          $tester.cycle(repeat: 145) # minimum of 144 cycles, adding 1 for safey measures
+        elsif options[:dssc_mode] == :dual
+          $tester.cycle(repeat: 289) # minimum of 288 cycles, adding 1 for safety measures
+        else
+          $tester.cycle(repeat: 577) # minimum of 577 cycles, adding 1 for safety measures
+        end
+      end
+
+      # Call this method at the end of each digscr overlay operation to clear the pattern
+      # memory pipeline, so that the pattern is ready to do the next digsrc overlay operation.
+      # Required arguments:
+      #                     pins
+      def digsrc_stop(pins, options = {})
+        if pins.size > 1
+          microcode "((#{format_multiple_instrument_pins(pins)}):DigSrc = Stop)"
+        else
+          microcode "((#{pins}):DigSrc = Stop)"
+        end
+      end
+
+      # Call this method before each tester cycle to insert the digsrc overlay microcode
+      def digsrc_send(pins)
+        microcode "((#{format_multiple_instrument_pins(pins)}):DigSrc = SEND)"
+      end
+
+      # Call this method before each tester cycle to inser the digcap overlay microcode
+      def digcap_store(pins)
+        microcode "((#{format_multiple_instrument_pins(pins)}):DigCap = STORE)"
+      end
+
+      def apply_digsrc_settings(options = {})
+        options.merge!(digsrc_width: 1) if options[:digsrc_width].nil? # default to digsrc 1
+        options.merge!(digsrc_bit_order: :lsb) if options[:digsrc_bit_order].nil? # default to lsb
+        options.merge!(digsrc_mode: :serial) if options[:digsrc_mode].nil? # default to serial mode
+        options.merge!(digsrc_format: :binary) if options[:digsrc_format].nil? # default to binary
+        options.merge!(digsrc_site_uniqueness: :unique_sites) if options[:digsrc_site_uniqueness].nil? # default to unique sites
+        options.merge!(digsrc_data_type: :default) if options[:digsrc_data_type].nil? # default to default
+        options.merge!(digsrc_auto_cond: :auto_cond_disable) if options[:digsrc_auto_cond].nil? # default to disable
+        @digsrc_settings = options
+      end
+
+      def apply_digcap_settings(options = {})
+        options.merge!(digcap_width: 8) if options[:digcap_width].nil? # default to digcap 8
+        options.merge!(digcap_bit_order: :lsb) if options[:digcap_bit_order].nil? # default to lsb
+        options.merge!(digcap_mode: :serial) if options[:digcap_mode].nil? # default to serial mode
+        options.merge!(digcap_site_uniqueness: :unique_sites) if options[:digcap_site_uniqueness].nil? # default to unique sites
+        options.merge!(digcap_format: :binary) if options[:digcap_format].nil? # default to binary
+        options.merge!(digcap_data_type: :default) if options[:digcap_data_type].nil? # default to default
+        options.merge!(digcap_auto_cond: :auto_cond_disable) if options[:digcap_auto_cond].nil? # default to disable
+        options.merge!(digcap_auto_trig_enable: :auto_trig_disable) if options[:digcap_auto_trig_enable].nil? # default to disable
+        options.merge!(digcap_store_stv: :store_stv_disable) if options[:digcap_store_stv].nil? # default to disable
+        options.merge!(digcap_receive_data: :store_stv_disable) if options[:digcap_receive_data].nil? # default to logic
+        @digcap_settings = options
+      end
+
+      # Call this method if there are more than one pin/pin groups used with an instrument,
+      # this method will format an array of pins into the correct format required by igxl
+      # pattern microcodes.
+      def format_multiple_instrument_pins(pins, options = {})
+        return_value = ''
+        pins.each do |pin|
+          return_value += "#{pin}"
+          return_value += ',' unless pins.last == pin
+        end
+        return_value
+      end
+
       def mask_fails(setclr)
         @mask_vector = setclr
       end

data/lib/origen_testers/igxl_based_tester/ultraflex.rb

@@ -187,6 +187,8 @@ module OrigenTesters
 
         options[:memory_test] = memory_test_en
         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|
@@ -194,9 +196,39 @@ module OrigenTesters
           end
         end
 
+        # Syntax for Digital Source
+        # instruments = {
+        #   pin-item:digsrc instrument-width: bit-order: instrument-mode:
+        #   site-uniqueness: format: auto_cond;
+        # }
+
+        if options[:digsrc_pins]
+          @digsrc_settings.each do |setting_name, setting|
+            options.merge!(setting_name => setting) if options[setting_name].nil?
+          end
+          options[:digsrc_pins].each do |pin|
+            options[:instruments].merge!(pin => 'digsrc')
+          end
+        end
+
+        # Syntax for Digital Capture
+        # instruments = {
+        #   pin-item:digcap instrument-width: bit-order: instrument-mode:
+        #   format: data-type: auto_cond: auto_trig_enable: store_stv: receive_data;
+        # }
+
+        if options[:digcap_pins]
+          @digcap_settings.each do |setting_name, setting|
+            options.merge!(setting_name => setting) if options[setting_name].nil?
+          end
+          options[:digcap_pins].each do |pin|
+            options[:instruments].merge!(pin => 'digcap')
+          end
+        end
+
         # If memory test, then add to instruments hash
         if options[:memory_test]
-          options[:instruments].merge!('mto' => 'nil')
+          options[:instruments].merge!('nil' => 'mto')
         end
 
         super(options.merge(digital_inst: @digital_instrument,

data/lib/origen_testers/interface.rb

@@ -28,13 +28,16 @@ module OrigenTesters
 
     # Compile a template file
     def compile(file, options = {})
+      # Any options passed in from an interface will be passed to the compiler and to
+      # the templates being compiled
+      options[:initial_options] = options
       Origen.file_handler.preserve_state do
         begin
           file = Origen.file_handler.clean_path_to_template(file)
-          Origen.generator.compile_file_or_directory(file, initial_options: options)
+          Origen.generator.compile_file_or_directory(file, options)
         rescue
           file = Origen.file_handler.clean_path_to(file)
-          Origen.generator.compile_file_or_directory(file, initial_options: options)
+          Origen.generator.compile_file_or_directory(file, options)
         end
       end
     end

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

@@ -28,7 +28,7 @@ module OrigenTesters
         # run entry in the flow.
         def test(test_suite, options = {})
           sbin = options[:sbin] || options[:softbin] || options[:soft_bin]
-          if options[:bin] || sbin
+          if (options[:bin] || sbin) && !options[:continue]
             node = run_and_branch(test_suite, options)
             options.delete(:id)
             # Only pass options to configure the bin, don't pass flow control options, those apply to the main

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

@@ -2,7 +2,7 @@ module OrigenTesters
   module SmartestBasedTester
     class Base
       class TestMethod
-        FORMAT_TYPES = [:current, :voltage, :time, :string, :integer]
+        FORMAT_TYPES = [:current, :voltage, :time, :string, :integer, :double]
 
         # Returns the object representing the test method library that the
         # given test method is defined in
@@ -100,7 +100,7 @@ module OrigenTesters
             "#{val}[s]"
           when :frequency
             "#{val}[Hz]"
-          when :string, :integer
+          when :string, :integer, :double
             val.to_s
           else
             fail "Unknown type for attribute #{attr}: #{type}"

data/lib/origen_testers/smartest_based_tester/base/test_methods/limits.rb

@@ -5,20 +5,32 @@ module OrigenTesters
         class Limits
           attr_reader :test_method
           attr_accessor :lo_limit, :hi_limit
+          attr_accessor :unit
 
           def initialize(test_method)
             @test_method = test_method
           end
 
+          def unit=(val)
+            case val.to_s.downcase
+            when 'v', 'volts'
+              @unit = 'V'
+            when 'a', 'amps'
+              @unit = 'A'
+            else
+              fail "Limit unit of #{val} not implemented yet!"
+            end
+          end
+
           def to_s
             if !lo_limit && !hi_limit
               "\"#{test_name}\"" + ' = "":"NA":"":"NA":"":"":""'
             elsif !lo_limit
-              "\"#{test_name}\"" + " = \"\":\"NA\":\"#{hi_limit}\":\"LE\":\"\":\"\":\"0\""
+              "\"#{test_name}\"" + " = \"\":\"NA\":\"#{hi_limit}\":\"LE\":\"#{unit}\":\"\":\"0\""
             elsif !hi_limit
-              "\"#{test_name}\"" + " = \"#{lo_limit}\":\"GE\":\"\":\"NA\":\"\":\"\":\"0\""
+              "\"#{test_name}\"" + " = \"#{lo_limit}\":\"GE\":\"\":\"NA\":\"#{unit}\":\"\":\"0\""
             else
-              "\"#{test_name}\"" + " = \"#{lo_limit}\":\"GE\":\"#{hi_limit}\":\"LE\":\"\":\"\":\"0\""
+              "\"#{test_name}\"" + " = \"#{lo_limit}\":\"GE\":\"#{hi_limit}\":\"LE\":\"#{unit}\":\"\":\"0\""
             end
           end
 

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

@@ -84,17 +84,22 @@ module OrigenTesters
         end
 
         def initialize(name, attrs = {})
-          self.name = name
+          @name = name
           # Set the defaults
           DEFAULTS.each do |k, v|
             send("#{k}=", v)
           end
           # Then the values that have been supplied
           attrs.each do |k, v|
-            send("#{k}=", v) if respond_to?("#{k}=")
+            send("#{k}=", v) if respond_to?("#{k}=") && k.to_sym != :name
           end
         end
 
+        # The name is immutable once the test_suite is created, this will raise an error when called
+        def name=(val, options = {})
+          fail 'Once assigned the name of a test suite cannot be changed!'
+        end
+
         def lines
           l = []
           l << '  override = 1;'

data/lib/origen_testers/smartest_based_tester/v93k/builder/flow.rb

@@ -116,16 +116,19 @@ module OrigenTesters
             end
           end
 
+          # Add the test methods from the given flow to this flow
           def add_test_methods(flow)
             flow.testmethods.each do |id, tm|
+              # If this flow already contains a test method with the current ID
               if testmethods[id]
                 nid = "tm_#{tm_ix}"
                 testmethods[nid] = tm
                 testmethodparameters[nid] = flow.testmethodparameters[id]
                 testmethodlimits[nid] = flow.testmethodlimits[id]
                 flow.test_suites.each do |tsid, ts|
-                  if ts['override_testf'] == "#{id};"
+                  if ts['override_testf'] == "#{id};" && !ts[:new_id]
                     ts['override_testf'] = "#{nid};"
+                    ts[:new_id] = true
                   end
                 end
               else
@@ -134,10 +137,15 @@ module OrigenTesters
                 testmethodlimits[id] = flow.testmethodlimits[id]
               end
             end
+            # Remove this temporary flag to prevent it rendering to the output file
+            flow.test_suites.each do |tsid, ts|
+              ts.delete(:new_id)
+            end
           end
 
           def add_test_suites(flow)
             flow.test_suites.each do |id, ts|
+              # If this flow already contains a test suite with the current ID
               if test_suites[id]
                 i = 1
                 nid = id
@@ -147,8 +155,9 @@ module OrigenTesters
                 end
                 test_suites[nid] = ts
                 flow.test_flow.map! do |line|
-                  if line =~ /(run|run_and_branch)\(#{id}\)/
-                    line.sub(id, nid)
+                  if line =~ /(run|run_and_branch)\(#{id}\)/ && line !~ /--NEW_ID--/
+                    line = line.sub(id, nid)
+                    line += '--NEW_ID--'
                   else
                     line
                   end
@@ -157,6 +166,9 @@ module OrigenTesters
                 test_suites[id] = ts
               end
             end
+            flow.test_flow.map! do |line|
+              line.sub('--NEW_ID--', '')
+            end
           end
 
           def tm_ix

data/lib/origen_testers/test/dut.rb

@@ -6,6 +6,10 @@ module OrigenTesters
       attr_accessor :blocks
       attr_accessor :hv_supply_pin
       attr_accessor :lv_supply_pin
+      attr_accessor :digsrc_pins
+      attr_accessor :digcap_pins
+      attr_accessor :digsrc_settings
+      attr_accessor :digcap_settings
 
       include OrigenARMDebug
       include Origen::TopLevel
@@ -25,6 +29,10 @@ module OrigenTesters
         end
         @hv_supply_pin = 'VDDHV'
         @lv_supply_pin = 'VDDLV'
+        @digsrc_pins = [:tdi, :tms]
+        @digsrc_settings = { digsrc_mode: :parallel, digsrc_bit_order: :msb }
+        @digcap_pins = :tdo
+        @digcap_settings = { digcap_format: :twos_complement }
         @blocks = [Block.new(0, self), Block.new(1, self), Block.new(2, self)]
       end
 
@@ -154,6 +162,46 @@ module OrigenTesters
         end
       end
 
+      def digsrc_overlay(options = {})
+        options = { define:            false,       # whether to define subr or call it
+                    subr_name:         false,       # default use match type as subr name
+                    digsrc_pins:       @digsrc_pins, # defaults to what's defined in $dut
+                    overlay_reg:       nil, # defaults to testme32 register
+                    overlay_cycle_num: 32, # Only needed if overlay_reg is NOT nil, this specificies how many clk cycles to overlay.
+                }.merge(options)
+        if options[:define]
+          $tester.start_subroutine(options[:subr_name]) # Start subroutine
+          digsrc_pins = $tester.assign_digsrc_pins(options[:digsrc_pins])
+          $tester.digsrc_start(digsrc_pins, dssc_mode: :single)
+          original_pin_states = {}
+          digsrc_pins.each do |pin|
+            original_pin_states.merge!(pin => pin(pin).data)
+            pin(pin).drive_mem
+          end
+          if options[:overlay_reg].nil?
+            options[:overlay_cycle_num].times do
+              $tester.digsrc_send(digsrc_pins)
+              $tester.cycle
+            end
+          else
+            $tester.dont_compress = true
+            options[:overlay_reg].size.times do
+              $tester.digsrc_send(digsrc_pins)
+              $tester.cycle
+            end
+          end
+          original_pin_states.each do |pin, state|
+            pin(pin).drive(state)
+          end
+          $tester.digsrc_stop(digsrc_pins)
+          $tester.cycle
+          $tester.end_subroutine # end subroutine
+        else
+          $tester.cycle
+          $tester.call_subroutine(options[:subr_name])
+        end
+      end
+
       def memory_test(options = {})
         options = {
         }.merge(options)

data/pattern/subroutines.rb

@@ -33,6 +33,13 @@ unless $tester.v93k?
       # Define handshake subr
       $dut.handshake(:define => true)
 
+      if $tester.ultraflex?
+        # Define digsrc_overlay_testme32 subr
+        $dut.digsrc_overlay(:subr_name => 'digsrc_overlay_testme32', :define => true, overlay_reg: :testme32)
+
+        # Define digsrc_overlay subr
+        $dut.digsrc_overlay(:subr_name => 'digsrc_overlay', :define => true, overlay_cycle_num: 64)
+      end 
     end
   end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement