origen_testers 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 560c1e1e8f0793808a3054fbfa0939d9e85fc178
-  data.tar.gz: f8d1745d6e6107d1a092bd420f4bcf92b2419c9d
+  metadata.gz: 0fef29207283a7c7837cfaef6fb5d32d4a422292
+  data.tar.gz: 4d41a6c74b72ef2fffae771928ec1356d7f989ba
 SHA512:
-  metadata.gz: 43d6f200cf2c285d52c56873debeb66d67a6d77ef873c77cf13f79ab936b064e8d42a2b4968ac1f83912eededa8f3a9b5cf459c3c365c7828d7ea7a20549aec9
-  data.tar.gz: b856f1c9b1dc241c94c90d2ff97122a0ced67c8f5add45b3b44cea5f33cc8083816a284a2355c58aaeb197c9dcdbbc2a0645c01f5d6371111a867dc7ea846913
+  metadata.gz: 0624f4f177bae4b5ad179601a22504a56dd8ca907b26bd6feca823443978c9575c5fd03f38f36a8e709f7caa1bedfec993be5c520045371b9178fd5320fff917
+  data.tar.gz: cbc5987d9c38140931121c5da1d9f1720b30ec02f8621cc7490aee665d3c24cda457dedb7931c1096b2a9273e6e233ff16ff2fecb4b6e011918f756871b06b87

data/config/commands.rb

@@ -21,6 +21,12 @@ aliases = {
 # Now branch to the specific task code
 case @command
 
+when "tags"
+  Dir.chdir Origen.root do
+    system "ripper-tags --recursive lib"
+  end
+  exit 0
+
 # Run the unit tests  
 when "specs"
   require "rspec"
@@ -68,6 +74,7 @@ else
  specs        Run the specs (tests), -c will enable coverage
  examples     Run the examples (tests), -c will enable coverage
  test         Run both specs and examples, -c will enable coverage
+ tags         Generate ctags for this app 
   EOT
 
 end 

data/config/version.rb

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

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

@@ -94,6 +94,7 @@ module OrigenTesters
           self.global_specs_filename = name
           self.jobs_filename = name
           self.references_filename = name
+          self.pattern_references_name = name
         end
 
         # Set the name of the current pinmap sheet. This does not change

data/lib/origen_testers/interface.rb

@@ -15,6 +15,19 @@ module OrigenTesters
       end
     end
 
+    class PatternArray < ::Array
+      def <<(pat)
+        push(pat)
+      end
+
+      # Override the array push method to capture the pattern under the new API, but
+      # maintain the old one where a pattern reference was just pushed to the
+      # referenced_patterns array
+      def push(pat)
+        Origen.interface.record_pattern_reference(pat)
+      end
+    end
+
     def self.with_resources_mode
       orig = @resources_mode
       @resources_mode = true
@@ -100,38 +113,108 @@ module OrigenTesters
 
     def on_program_completion(options = {})
       reset_globals
+      @@pattern_references = {}
       @@referenced_patterns = nil
-      @@referenced_subroutine_patterns = nil
     end
 
+    # A secondary pattern is one where the pattern has been created by Origen as an output from
+    # generating another pattern (a primary pattern). For example, on V93K anytime a tester
+    # handshake is done, the pattern will be split into separate components, such as
+    # meas_bgap.avc (the primary pattern) and meas_bgap_part1.avc (a secondary pattern).
+    #
+    # Any such secondary pattern references should be pushed to this array, rather than the
+    # referenced_patterns array.
+    # By using the dedicated secondary array, the pattern will not appear in the referenced.list
+    # file so that Origen is not asked to generate it (since it will be created naturally from
+    # the primary pattern reference).
+    # However if the ATE requires a reference to the pattern (e.g. the V93K pattern master file),
+    # then it will be included in the relevant ATE files.
+    def record_pattern_reference(name, options = {})
+      if name.is_a?(String) || name.is_a?(Symbol)
+        name = name.to_s
+      else
+        fail "Pattern name must be a string or a symbol, not a #{name.class}"
+      end
+      # Help out the user and force any multi-part patterns to :ate type
+      unless options[:type]
+        if name.sub(/\..*/, '') =~ /part\d+$/
+          options[:type] = :ate
+        end
+      end
+      unless options[:type] == :origen
+        # Inform the current generator that it has a new pattern reference to handle
+        if respond_to?(:pattern_reference_recorded)
+          pattern_reference_recorded(name, options)
+        end
+      end
+      base = options[:subroutine] ? pattern_references[:subroutine] : pattern_references[:main]
+      case options[:type]
+      when :origen
+        base[:origen] << name
+      when :ate
+        base[:ate] << name
+      when nil
+        base[:all] << name
+      else
+        fail "Unknown pattern reference type, #{options[:type]}, valid values are :origen or :ate"
+      end
+      nil
+    end
+
+    def pattern_references
+      @@pattern_references ||= {}
+      @@pattern_references[pattern_references_name] ||= {
+        main:       {
+          all:    [],
+          origen: [],
+          ate:    []
+        },
+        subroutine: {
+          all:    [],
+          origen: [],
+          ate:    []
+        }
+      }
+    end
+
+    def all_pattern_references
+      pattern_references
+      @@pattern_references
+    end
+
+    def pattern_references_name=(name)
+      @pattern_references_name = name
+    end
+
+    def pattern_references_name
+      @pattern_references_name || 'global'
+    end
+
+    # @deprecated Use record_pattern_reference instead
+    #
     # All generators should push to this array whenever they reference a pattern
     # so that it is captured in the pattern list, e.g.
     #   Origen.interface.referenced_patterns << pattern
+    #
+    # If the ATE platform also has a pattern list, e.g. the pattern master file on V93K,
+    # then this will also be updated.
+    # Duplicates will be automatically eliminated, so no duplicate checking should be
+    # performed on the application side.
     def referenced_patterns
-      @@referenced_patterns ||= []
-    end
-
-    # All generators should push to this array whenever they reference a subroutine
-    # pattern so that it is captured in the pattern list, e.g.
-    #   Origen.interface.referenced_subroutine_patterns << pattern
-    def referenced_subroutine_patterns
-      unless Origen.tester.v93k?
-        fail 'referenced_subroutine_patterns is currently only implemented for V93k!'
-      end
-      @@referenced_subroutine_patterns ||= []
+      @@referenced_patterns ||= PatternArray.new
     end
 
     # Remove duplicates and file extensions from the referenced pattern lists
     def clean_referenced_patterns
       refs = [:referenced_patterns]
-      refs << :referenced_subroutine_patterns if Origen.tester.v93k?
+      # refs << :referenced_subroutine_patterns if Origen.tester.v93k?
       refs.each do |ref|
-        ref = send(ref)
-        ref.uniq!
-        ref.map! do |pat|
-          pat.sub(/\..*/, '')
-        end
-        ref.uniq!
+        var = send(ref)
+        var = var.uniq.map do |pat|
+          pat = pat.sub(/\..*/, '')
+          pat unless pat =~ /_part\d+$/
+        end.uniq.compact
+        singleton_class.class_variable_set("@@#{ref}", var)
       end
     end
 

data/lib/origen_testers/origen_ext/generator.rb

@@ -7,6 +7,8 @@ else
 end
 module Origen
   class Generator
+    include Comparator
+
     # Makes more sense for this plugin to own this method now
     def generate_program(file, options)
       Origen.file_handler.resolve_files(file, ignore_with_prefix: '_', default_dir: "#{Origen.root}/program") do |path|
@@ -26,10 +28,25 @@ module Origen
         dir = Pathname.new(file).dirname
         FileUtils.mkdir_p(dir) unless dir.exist?
         File.open(file, 'w') do |f|
-          Origen.interface.referenced_patterns.uniq.sort.each do |pat|
-            f.puts pat
+          pats = Origen.interface.all_pattern_references.map do |name, refs|
+            refs[:main][:all] + refs[:main][:origen]
+          end.flatten.uniq.sort
+          unless pats.empty?
+            f.puts '# Main patterns'
+            pats.each { |p| f.puts p }
+            f.puts
+          end
+
+          pats = Origen.interface.all_pattern_references.map do |name, refs|
+            refs[:subroutine][:all] + refs[:subroutine][:origen]
+          end.flatten.uniq.sort
+          unless pats.empty?
+            f.puts '# Subroutine patterns'
+            pats.each { |p| f.puts p }
           end
         end
+        ref_file = File.join(Origen.file_handler.reference_directory, Pathname.new(file).basename)
+        check_for_changes(file, ref_file)
       end
       Origen.interface.on_program_completion(options)
     end

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -75,12 +75,8 @@ module OrigenTesters
       end
       alias_method :capture, :store
 
-      # Capture the next vector generated to HRAM
-      #
-      # This method applys a store vector (stv) opcode to the next vector to be generated,
-      # note that is does not actually generate a new vector.
-      #
-      # On J750 the pins argument is ignored since the tester only supports whole vector capture.
+      # Same as the store method, except that the capture will be applied to the next
+      # vector to be generated.
       #
       # @example
       #   $tester.store_next_cycle

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

@@ -4,10 +4,10 @@ module OrigenTesters
       class Flow < ATP::Formatter
         include OrigenTesters::Flow
 
-        attr_accessor :test_suites, :test_methods, :pattern_master, :lines, :stack
+        attr_accessor :test_suites, :test_methods, :lines, :stack
 
         def subdirectory
-          'testflow'
+          'testflow/mfh.testflow.group'
         end
 
         def filename
@@ -26,6 +26,12 @@ module OrigenTesters
           @runtime_control_variables ||= []
         end
 
+        def at_flow_start
+        end
+
+        def at_flow_end
+        end
+
         def finalize(options = {})
           super
           test_suites.finalize

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

@@ -16,6 +16,8 @@ module OrigenTesters
         def initialize(options = {})
           super
           @initialized = true
+          @@pattern_masters ||= {}
+          @@pattern_compilers ||= {}
         end
 
         def add_tml(name, methods)
@@ -27,16 +29,34 @@ module OrigenTesters
         # @api private
         def at_flow_start
           flow.at_flow_start
+          @pattern_master_filename = nil
+        end
+
+        # @api private
+        def at_flow_end
+          flow.at_flow_end
         end
 
         # @api private
         def at_run_start
           flow.at_run_start
           @@flow_sheets = nil
+          @@pattern_masters = nil
+          @@pattern_compilers = nil
         end
         alias_method :reset_globals, :at_run_start
 
         def resources_filename=(name)
+          self.pattern_master_filename = name
+          self.pattern_references_name = name
+        end
+
+        def pattern_master_filename=(name)
+          @pattern_master_filename = name
+        end
+
+        def pattern_master_filename
+          @pattern_master_filename || 'global'
         end
 
         def flow(filename = Origen.file_handler.current_file.basename('.rb').to_s)
@@ -48,35 +68,48 @@ module OrigenTesters
           p.filename = f
           p.test_suites ||= platform::TestSuites.new(p)
           p.test_methods ||= platform::TestMethods.new(p)
-          p.pattern_master ||= platform::PatternMaster.new(p)
           flow_sheets[f] = p
         end
 
-        # Returns a top-level pattern master file which will contain all patterns from
-        # all flows. Additionally each flow has its own pattern master file containing
-        # only the patterns for the specific flow.
+        # Returns the pattern master file (.pmfl) for the current flow, by default a common pattern
+        # master file called 'global' will be used for all flows.
+        # To use a different one set the resources_filename at the start of the flow.
         def pattern_master
-          @pattern_master ||= begin
+          @@pattern_masters ||= {}
+          @@pattern_masters[pattern_master_filename] ||= begin
             m = platform::PatternMaster.new(manually_register: true)
-            name = 'complete.pmfl'
+            name = "#{pattern_master_filename}.pmfl"
             name = "#{Origen.config.program_prefix}_#{name}" if Origen.config.program_prefix
             m.filename = name
+            m.id = pattern_master_filename
             m
           end
         end
 
-        # Generates a pattern compiler configuration file (.aiv) to compile all
-        # patterns referenced in all flows.
+        # Returns the pattern compiler file (.aiv) for the current flow, by default a common pattern
+        # compiler file called 'global' will be used for all flows.
+        # To use a different one set the resources_filename at the start of the flow.
         def pattern_compiler
-          @pattern_compiler ||= begin
+          @@pattern_compilers ||= {}
+          @@pattern_compilers[pattern_master_filename] ||= begin
             m = platform::PatternCompiler.new(manually_register: true)
-            name = 'complete.aiv'
+            name = "#{pattern_master_filename}.aiv"
             name = "#{Origen.config.program_prefix}_#{name}" if Origen.config.program_prefix
             m.filename = name
+            m.id = pattern_master_filename
             m
           end
         end
 
+        # @api private
+        def pattern_reference_recorded(name, options = {})
+          # Will be called everytime a pattern reference is made that the ATE should be aware of,
+          # don't need to remember it as it can be fetched from all_pattern_references later, but
+          # need to instantiate a pattern master and compiler to handle it later
+          pattern_master
+          pattern_compiler
+        end
+
         def test_suites
           flow.test_suites
         end
@@ -95,10 +128,13 @@ module OrigenTesters
           g = []
           flow_sheets.each do |_name, sheet|
             g << sheet
-            g << sheet.pattern_master
           end
-          g << pattern_master if pattern_master
-          g << pattern_compiler unless referenced_subroutine_patterns.empty? && referenced_patterns.empty?
+          Hash(@@pattern_masters).each do |name, sheet|
+            g << sheet
+          end
+          Hash(@@pattern_compilers).each do |name, sheet|
+            g << sheet
+          end
           g
         end
 

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

@@ -5,17 +5,26 @@ module OrigenTesters
       class PatternCompiler
         include OrigenTesters::Generator
 
-        attr_accessor :filename
+        attr_accessor :filename, :part_patterns, :id
 
         def initialize(flow = nil)
+          @part_patterns = []
         end
 
         def subroutines
-          Origen.interface.referenced_subroutine_patterns
+          (references[:subroutine][:all] + references[:subroutine][:ate]).map do |p|
+            p.strip.sub(/\..*/, '')
+          end.uniq.sort
         end
 
         def patterns
-          Origen.interface.referenced_patterns
+          (references[:main][:all] + references[:main][:ate]).map do |p|
+            p.strip.sub(/\..*/, '')
+          end.uniq.sort
+        end
+
+        def references
+          Origen.interface.all_pattern_references[id]
         end
       end
     end

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

@@ -6,7 +6,7 @@ module OrigenTesters
         include OrigenTesters::Generator
 
         attr_reader :flow, :paths
-        attr_accessor :filename
+        attr_accessor :filename, :id
 
         def initialize(flow = nil)
           @flow = flow
@@ -14,20 +14,42 @@ module OrigenTesters
         end
 
         def filename
-          @filename || flow.filename.sub('.flow', '.pmfl')
+          @filename || flow.filename.sub('.tf', '.pmfl')
         end
 
         def subdirectory
           'vectors'
         end
 
-        def add(name, options = {})
-          name, subdir = extract_subdir(name, options)
-          name += '.binl.gz' unless name =~ /binl.gz$/
-          Origen.interface.referenced_patterns << name
-          paths[subdir] ||= []
-          # Just add it, duplicates will be removed at render time
-          paths[subdir] << name unless paths[subdir].include?(name)
+        def paths
+          { '.' => patterns }
+        end
+
+        # def add(name, options = {})
+        #  name, subdir = extract_subdir(name, options)
+        #  name += '.binl.gz' unless name =~ /binl.gz$/
+        #  # Don't want to ask Origen to compile these, but do want them in the v93k
+        #  # compile list
+        #  if name =~ /_part\d+\.binl\.gz$/
+        #    Origen.interface.pattern_compiler.part_patterns << name
+        #  else
+        #    Origen.interface.referenced_patterns << name
+        #  end
+        #  paths[subdir] ||= []
+        #  # Just add it, duplicates will be removed at render time
+        #  paths[subdir] << name unless paths[subdir].include?(name)
+        # end
+
+        def patterns
+          (references[:subroutine][:all] + references[:subroutine][:ate] +
+            references[:main][:all] + references[:main][:ate]).map do |p|
+            p = p.strip
+            p += '.binl.gz' unless p =~ /binl.gz$/
+          end.uniq
+        end
+
+        def references
+          Origen.interface.all_pattern_references[id]
         end
 
         private

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

@@ -89,7 +89,14 @@ module OrigenTesters
             type = parameters[attr]
           else
             # The type is based on the value of another attribute
-            type = send(clean_attr_name(parameters[attr]))
+            name = clean_attr_name(parameters[attr])
+            if respond_to?(name)
+              type = send(name)
+            elsif respond_to?(name.sub(/b$/, ''))
+              type = inverse_of(send(name.sub(/b$/, '')))
+            else
+              fail "Unknown attribute type: #{parameters[attr]}"
+            end
           end
           case type
           when :current, 'CURR'
@@ -130,6 +137,17 @@ module OrigenTesters
 
         private
 
+        def inverse_of(type)
+          case type
+          when :current, 'CURR'
+            :voltage
+          when :voltage, 'VOLT'
+            :current
+          else
+            fail "Don't know the inverse of type: #{type}"
+          end
+        end
+
         def clean_attr_name(name)
           name.to_s.gsub(/\.|-/, '_')
         end

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

@@ -41,7 +41,7 @@ module OrigenTesters
               pinlist:           [:string, '@'],
               force_mode:        [:string, 'VOLT', %w(VOLT CURR)],
               force_value:       [:force_mode, 3800.mV],
-              spmu_clamp:        [:current, 0],
+              spmu_clamp:        [:force_modeb, 0],
               precharge:         [:string, 'OFF', %w(ON OFF)],
               precharge_voltage: [:voltage, 0],
               settling_time:     [:time, 0],

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

@@ -6,6 +6,10 @@ module OrigenTesters
           attr_reader :test_method
           attr_accessor :lo_limit, :hi_limit
           attr_accessor :unit
+          alias_method :lo, :lo_limit
+          alias_method :lo=, :lo_limit=
+          alias_method :hi, :hi_limit
+          alias_method :hi=, :hi_limit=
 
           def initialize(test_method)
             @test_method = test_method

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

@@ -95,6 +95,11 @@ module OrigenTesters
           end
         end
 
+        def pattern=(name)
+          Origen.interface.record_pattern_reference(name)
+          @pattern = name
+        end
+
         def inspect
           "<TestSuite: #{name}>"
         end

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

@@ -32,12 +32,8 @@ module OrigenTesters
         end
 
         def finalize
-          collection.each do |suite|
-            if suite.pattern
-              flow.pattern_master.add suite.pattern
-              Origen.interface.pattern_master.add suite.pattern
-            end
-          end
+          # collection.each do |suite|
+          # end
         end
 
         private

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

@@ -3,7 +3,7 @@ module OrigenTesters
     class V93K
       require 'origen_testers/smartest_based_tester/base/flow'
       class Flow < Base::Flow
-        TEMPLATE = "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k/templates/template.flow.erb"
+        TEMPLATE = "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k/templates/template.tf.erb"
       end
     end
   end

data/lib/origen_testers/smartest_based_tester/v93k/templates/template.aiv.erb

@@ -9,9 +9,9 @@ single_binary_pattern_dir       ./BINL/
 AI_V2B_OPTIONS  -ALT -c <%= $dut.name.to_s.upcase %>.vbc -k -z PS800
 
 PATTERNS name tmf_file v2b_options
-%   subroutines.uniq.sort.each do |pattern|
-<%= pattern.sub(/\..*/, '') %> <%= $dut.name.to_s.upcase %>.tmf -s
+%   subroutines.each do |pattern|
+<%= pattern %> <%= $dut.name.to_s.upcase %>.tmf -s
 %   end
-%   patterns.uniq.sort.each do |pattern|
-<%= pattern.sub(/\..*/, '') %> <%= $dut.name.to_s.upcase %>.tmf
+%   patterns.each do |pattern|
+<%= pattern %> <%= $dut.name.to_s.upcase %>.tmf
 %   end

data/lib/origen_testers/smartest_based_tester/v93k/templates/template.pmfl.erb

@@ -6,7 +6,7 @@ path:
 <%= path %>
 
 files:
-%   patterns.uniq.sort.each do |pattern|
+%   patterns.sort.each do |pattern|
 <%= pattern %>
 %   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.23
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -319,8 +319,8 @@ files:
 - lib/origen_testers/smartest_based_tester/v93k/pattern_compiler.rb
 - lib/origen_testers/smartest_based_tester/v93k/pattern_master.rb
 - lib/origen_testers/smartest_based_tester/v93k/templates/template.aiv.erb
-- lib/origen_testers/smartest_based_tester/v93k/templates/template.flow.erb
 - lib/origen_testers/smartest_based_tester/v93k/templates/template.pmfl.erb
+- lib/origen_testers/smartest_based_tester/v93k/templates/template.tf.erb
 - lib/origen_testers/smartest_based_tester/v93k/test_method.rb
 - lib/origen_testers/smartest_based_tester/v93k/test_methods.rb
 - lib/origen_testers/smartest_based_tester/v93k/test_suite.rb
@@ -406,4 +406,3 @@ specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like
   the J750, UltraFLEX, V93K,...
 test_files: []
-has_rdoc: