origen_testers 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6244c25bef50d180f012dd648c56a16557082e41
-  data.tar.gz: 901fdc6849503a4149272d65a72474efee0887f5
+  metadata.gz: 8fa93b1de5dc4b7588e87bedbf2766dfde8fb16e
+  data.tar.gz: d1513d3d83ea18680d577f7ffab62a9ec17a6dec
 SHA512:
-  metadata.gz: fcd1d57220bc8fc4e2beadf8dc0c41f4eaa588c4f6f249ee167af2cfec7902ad86fa3625cac9dc52299328b7eed01276734b8337a71e7e80c6d3c6f5e3add4fc
-  data.tar.gz: b855192520b92abdec8c4dc3df3e82b215fa1b160612da2f4320fea3dfad4541cb96ec7c5b9f6e1d1548949b71db5f311f6394701b3a3497ff521fd7d9dfb8f6
+  metadata.gz: 12dfc6462fdeacb4d8044447b78c5144115dd711008e637bde53772ef46974b209be09f8fb6af392dd6c73ac8b75e39b4423f98b6de02de5521cfc405dab1821
+  data.tar.gz: 8843504728de2a0e1df34c0d2dcf95f56e8967b6e557d374656571e5348cec6896527a97e5fb9b9eaf4d7b4ffdf07a199d59340d87dd9f69265b5c349cee6293

data/config/version.rb

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

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

@@ -4,7 +4,11 @@ module OrigenTesters
       class Flow < ATP::Formatter
         include OrigenTesters::Flow
 
-        attr_accessor :test_suites, :test_methods, :lines, :stack
+        attr_accessor :test_suites, :test_methods, :lines, :stack, :var_filename
+
+        def var_filename
+          @var_filename || 'global'
+        end
 
         def subdirectory
           'testflow/mfh.testflow.group'
@@ -19,11 +23,11 @@ module OrigenTesters
         end
 
         def flow_control_variables
-          @flow_control_variables ||= []
+          Origen.interface.variables_file(self).flow_control_variables
         end
 
         def runtime_control_variables
-          @runtime_control_variables ||= []
+          Origen.interface.variables_file(self).runtime_control_variables
         end
 
         def at_flow_start
@@ -40,14 +44,20 @@ module OrigenTesters
           @lines = []
           @stack = { on_fail: [], on_pass: [] }
           process(model.ast)
-          flow_control_variables.uniq!
-          runtime_control_variables.uniq!
         end
 
         def line(str)
           @lines << (' ' * @indent * 2) + str
         end
 
+        # def on_flow(node)
+        #  line '{'
+        #  @indent += 1
+        #  process_all(node.children)
+        #  @indent -= 1
+        #  line "}, open,\"#{unique_group_name(node.find(:name).value)}\", \"\""
+        # end
+
         def on_test(node)
           name = node.find(:object).to_a[0]
           name = name.name unless name.is_a?(String)
@@ -84,7 +94,7 @@ module OrigenTesters
         def on_job(node)
           jobs, state, *nodes = *node
           jobs = clean_job(jobs)
-          flow_control_variables << ['JOB', '']
+          runtime_control_variables << ['JOB', '']
           condition = jobs.join(' or ')
           line "if #{condition} then"
           line '{'

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

@@ -16,8 +16,6 @@ module OrigenTesters
         def initialize(options = {})
           super
           @initialized = true
-          @@pattern_masters ||= {}
-          @@pattern_compilers ||= {}
         end
 
         def add_tml(name, methods)
@@ -43,12 +41,14 @@ module OrigenTesters
           @@flow_sheets = nil
           @@pattern_masters = nil
           @@pattern_compilers = nil
+          @@variables_files = nil
         end
         alias_method :reset_globals, :at_run_start
 
         def resources_filename=(name)
           self.pattern_master_filename = name
           self.pattern_references_name = name
+          flow.var_filename = name
         end
 
         def pattern_master_filename=(name)
@@ -75,8 +75,7 @@ module OrigenTesters
         # 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_masters ||= {}
-          @@pattern_masters[pattern_master_filename] ||= begin
+          pattern_masters[pattern_master_filename] ||= begin
             m = platform::PatternMaster.new(manually_register: true)
             name = "#{pattern_master_filename}.pmfl"
             name = "#{Origen.config.program_prefix}_#{name}" if Origen.config.program_prefix
@@ -86,12 +85,16 @@ module OrigenTesters
           end
         end
 
+        # Returns a hash containing all pattern master generators
+        def pattern_masters
+          @@pattern_masters ||= {}
+        end
+
         # 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_compilers ||= {}
-          @@pattern_compilers[pattern_master_filename] ||= begin
+          pattern_compilers[pattern_master_filename] ||= begin
             m = platform::PatternCompiler.new(manually_register: true)
             name = "#{pattern_master_filename}.aiv"
             name = "#{Origen.config.program_prefix}_#{name}" if Origen.config.program_prefix
@@ -101,6 +104,31 @@ module OrigenTesters
           end
         end
 
+        # Returns a hash containing all pattern compiler generators
+        def pattern_compilers
+          @@pattern_compilers ||= {}
+        end
+
+        # Returns the variables file for the current or given flow, by default a common variable
+        # 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 variables_file(flw = nil)
+          name = (flw || flow).var_filename
+          variables_files[name] ||= begin
+            m = platform::VariablesFile.new(manually_register: true)
+            filename = "#{name}_vars.tf"
+            filename = "#{Origen.config.program_prefix}_#{filename}" if Origen.config.program_prefix
+            m.filename = filename
+            m.id = name
+            m
+          end
+        end
+
+        # Returns a hash containing all variables file generators
+        def variables_files
+          @@variables_files ||= {}
+        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,
@@ -129,10 +157,13 @@ module OrigenTesters
           flow_sheets.each do |_name, sheet|
             g << sheet
           end
-          Hash(@@pattern_masters).each do |name, sheet|
+          pattern_masters.each do |name, sheet|
+            g << sheet
+          end
+          pattern_compilers.each do |name, sheet|
             g << sheet
           end
-          Hash(@@pattern_compilers).each do |name, sheet|
+          variables_files.each do |name, sheet|
             g << sheet
           end
           g

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

@@ -22,7 +22,7 @@ module OrigenTesters
         end
 
         def paths
-          { '.' => patterns }
+          { '../vectors' => patterns }
         end
 
         # def add(name, options = {})

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

@@ -85,6 +85,9 @@ module OrigenTesters
 
         def initialize(name, attrs = {})
           @name = name
+          if interface.flow.sig
+            @name = "#{name}_#{interface.flow.sig}"
+          end
           # Set the defaults
           DEFAULTS.each do |k, v|
             send("#{k}=", v)
@@ -143,6 +146,10 @@ module OrigenTesters
           (test_method && test_method.respond_to?(method)) || super
         end
 
+        def interface
+          Origen.interface
+        end
+
         private
 
         def flags

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

@@ -0,0 +1,35 @@
+require 'pathname'
+module OrigenTesters
+  module SmartestBasedTester
+    class Base
+      class VariablesFile
+        include OrigenTesters::Generator
+
+        attr_reader :flow_control_variables, :runtime_control_variables
+        attr_accessor :filename, :id
+
+        def initialize(options = {})
+          @flow_control_variables = []
+          @runtime_control_variables = []
+        end
+
+        def subdirectory
+          'testflow/mfh.testflow.setup'
+        end
+
+        def clean_flow_control_variables
+          # These map to user flags and can only be integers
+          flow_control_variables.uniq.sort
+        end
+
+        def clean_runtime_control_variables
+          runtime_control_variables.uniq.sort do |x, y|
+            x = x[0] if x.is_a?(Array)
+            y = y[0] if y.is_a?(Array)
+            x <=> y
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,89 +11,90 @@ information
 %     end
 %   end
 % else
--- STOPDIFF
-test_revision = "<%= Origen.app.version %>";
--- STARTDIFF
+%# Disabled for now, SMT master file doesn't like it
+%#-- STOPDIFF
+%#test_revision = "<%= Origen.app.version %>";
+%#-- STARTDIFF
 % end
  
 end
---------------------------------------------------
-declarations
-
-% if program
-%   program.declarations.each do |key, val|
-<%= key %> = <%= val %>
-%   end
-% else
-%   flow_control_variables.each do |var|
-%     if var.is_a?(Array)
-@<%= var[0].to_s.upcase %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
-%     else
-@<%= var.to_s.upcase %> = -1;
-%     end
-%   end
-%   runtime_control_variables.each do |var|
-%     if var.is_a?(Array)
-@<%= var[0].to_s.upcase %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
-%     else
-@<%= var.to_s.upcase %> = -1;
-%     end
-%   end
-% end
-end
+%#--------------------------------------------------
+%#declarations
+%#
+%#% if program
+%#%   program.declarations.each do |key, val|
+%#<%= key %> = <%= val %>
+%#%   end
+%#% else
+%#%   flow_control_variables.each do |var|
+%#%     if var.is_a?(Array)
+%#@<%= var[0].to_s.upcase %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
+%#%     else
+%#@<%= var.to_s.upcase %> = -1;
+%#%     end
+%#%   end
+%#%   runtime_control_variables.each do |var|
+%#%     if var.is_a?(Array)
+%#@<%= var[0].to_s.upcase %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
+%#%     else
+%#@<%= var.to_s.upcase %> = -1;
+%#%     end
+%#%   end
+%#% end
+%#end
 --------------------------------------------------
 implicit_declarations
 
 end
 -----------------------------------------------------------------
-flags
-
-% if program
-%   program.flags.each do |key, val|
-<%= key %> = <%= val %>
-%   end
-% else
-datalog_formatter = 0;
-datalog_sample_size = 1;
-graphic_result_displa = 1;
-state_display = 0;
-print_wafermap = 0;
-ink_wafer = 0;
-max_reprobes = 1;
-temp_monitor = 1;
-calib_age_monitor = 1;
-diag_monitor = 1;
-current_monitor = 1;
-log_events_enable = 1;
-set_pass_level = 0;
-set_fail_level = 0;
-set_bypass_level = 0;
-hold_on_fail = 0;
-global_hold = 0;
-debug_mode = 0;
-debug_analog = 0;
-parallel_mode = 1;
-site_match_mode = 2;
-global_overon = 0;
-limits_enable = 0;
-test_number_enable = 1;
-test_number_inc = 1;
-log_cycles_before = 0;
-log_cycles_after = 0;
-unburst_mode = 0;
-sqst_mode = 0;
-warn_as_fail = 1;
-use_hw_dsp = 0;
-dsp_file_enable = 0;
-buffer_testflow_log = 0;
-check_testmethod_api = 0;
-stdf_generation = 1;
-tm_crash_as_fatal = 1;
-hidden_datalog_mode = 0;
-multibin_mode = 0;
-% end
-end
------------------------------------------------------------------
+%#flags
+%#
+%#% if program
+%#%   program.flags.each do |key, val|
+%#<%= key %> = <%= val %>
+%#%   end
+%#% else
+%#datalog_formatter = 0;
+%#datalog_sample_size = 1;
+%#graphic_result_displa = 1;
+%#state_display = 0;
+%#print_wafermap = 0;
+%#ink_wafer = 0;
+%#max_reprobes = 1;
+%#temp_monitor = 1;
+%#calib_age_monitor = 1;
+%#diag_monitor = 1;
+%#current_monitor = 1;
+%#log_events_enable = 1;
+%#set_pass_level = 0;
+%#set_fail_level = 0;
+%#set_bypass_level = 0;
+%#hold_on_fail = 0;
+%#global_hold = 0;
+%#debug_mode = 0;
+%#debug_analog = 0;
+%#parallel_mode = 1;
+%#site_match_mode = 2;
+%#global_overon = 0;
+%#limits_enable = 0;
+%#test_number_enable = 1;
+%#test_number_inc = 1;
+%#log_cycles_before = 0;
+%#log_cycles_after = 0;
+%#unburst_mode = 0;
+%#sqst_mode = 0;
+%#warn_as_fail = 1;
+%#use_hw_dsp = 0;
+%#dsp_file_enable = 0;
+%#buffer_testflow_log = 0;
+%#check_testmethod_api = 0;
+%#stdf_generation = 1;
+%#tm_crash_as_fatal = 1;
+%#hidden_datalog_mode = 0;
+%#multibin_mode = 0;
+%#% end
+%#end
+%#-----------------------------------------------------------------
 testmethodparameters
 % if program
 %   program.testmethodparameters.each do |id, parameters|
@@ -175,13 +176,15 @@ test_flow
 %   end
 % else
 {
-%   runtime_control_variables.each do |var|
-    @<%= var.to_s.upcase %> = -1;
-%   end
-}, open,"Init Flow Control Vars", ""
+%#  {
+%#%   runtime_control_variables.each do |var|
+%#    @<%= var.to_s.upcase %> = -1;
+%#%   end
+%#  }, open,"Init Flow Control Vars", ""
 %   lines.each do |line|
-<%= line %>
+  <%= line %>
 %   end
+}, open,"<%= filename.sub(/\..*/, '').upcase %>", ""
 % end
 end
 -------------------------------------------------

data/lib/origen_testers/smartest_based_tester/v93k/templates/vars.tf.erb

@@ -0,0 +1,48 @@
+hp93000,testflow,0.1
+language_revision = 1;
+
+declarations
+
+% clean_runtime_control_variables.each do |var|
+%   if var.is_a?(Array)
+@<%= var[0].to_s.upcase %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
+%   else
+@<%= var.to_s.upcase %> = 0;
+%   end
+% end
+
+end
+-----------------------------------------------------------------
+flags
+
+% clean_flow_control_variables.each do |var|
+%   if var.is_a?(Array)
+user <%= var[0].to_s.upcase %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
+%   else
+user <%= var.to_s.upcase %> = 0;
+%   end
+% end
+
+end
+-----------------------------------------------------------------
+testmethodparameters
+end
+-----------------------------------------------------------------
+testmethodlimits
+end
+-----------------------------------------------------------------
+test_flow
+end
+-----------------------------------------------------------------
+binning
+end
+-----------------------------------------------------------------
+oocrule
+end
+-----------------------------------------------------------------
+context
+end
+-----------------------------------------------------------------
+hardware_bin_descriptions
+end
+-----------------------------------------------------------------

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

@@ -0,0 +1,10 @@
+module OrigenTesters
+  module SmartestBasedTester
+    class V93K
+      require 'origen_testers/smartest_based_tester/base/variables_file'
+      class VariablesFile < Base::VariablesFile
+        TEMPLATE = "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k/templates/vars.tf.erb"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -310,6 +310,7 @@ files:
 - lib/origen_testers/smartest_based_tester/base/test_methods/limits.rb
 - lib/origen_testers/smartest_based_tester/base/test_suite.rb
 - lib/origen_testers/smartest_based_tester/base/test_suites.rb
+- lib/origen_testers/smartest_based_tester/base/variables_file.rb
 - lib/origen_testers/smartest_based_tester/v93k.rb
 - lib/origen_testers/smartest_based_tester/v93k/builder.rb
 - lib/origen_testers/smartest_based_tester/v93k/builder/flow.rb
@@ -321,10 +322,12 @@ files:
 - lib/origen_testers/smartest_based_tester/v93k/templates/template.aiv.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/templates/vars.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
 - lib/origen_testers/smartest_based_tester/v93k/test_suites.rb
+- lib/origen_testers/smartest_based_tester/v93k/variables_file.rb
 - lib/origen_testers/test/basic_interface.rb
 - lib/origen_testers/test/block.rb
 - lib/origen_testers/test/custom_test_interface.rb