origen_testers 0.31.0 → 0.40.0

data/lib/origen_testers/smartest_based_tester/v93k_smt8/limits_file.rb

@@ -0,0 +1,14 @@
+module OrigenTesters
+  module SmartestBasedTester
+    class V93K_SMT8
+      require 'origen_testers/smartest_based_tester/base/limits_file'
+      class LimitsFile < Base::LimitsFile
+        TEMPLATE = "#{Origen.root!}/lib/origen_testers/smartest_based_tester/v93k_smt8/templates/limits.csv.erb"
+
+        def fully_formatted_filename
+          "Main.#{@filename}_Tests.csv"
+        end
+      end
+    end
+  end
+end

data/lib/origen_testers/smartest_based_tester/v93k_smt8/limits_workbook.rb

@@ -0,0 +1,148 @@
+require 'rodf'
+module OrigenTesters
+  module SmartestBasedTester
+    class V93K_SMT8
+      # Responsible for creating a limits workbook for each program generation run
+      # Each limits file will generate a sheet within this workbook
+      class LimitsWorkbook
+        include OrigenTesters::Generator
+
+        def initialize(options = {})
+          @softbins = {}
+          @bins = {}
+        end
+
+        def add_softbin(number, options = {})
+          options = {
+            name:     nil,
+            bin:      nil,
+            result:   'FAIL',
+            color:    'RED',
+            priority: 2
+          }.merge(options)
+          attrs = @softbins[number] || {}
+
+          attrs[:name] = options[:name] if options[:name]
+          attrs[:bin] = options[:bin] if options[:bin]
+          if !attrs[:result] || (options[:result] && options[:result] != 'FAIL')
+            attrs[:result] = options[:result]
+          end
+          if !attrs[:color] || (options[:color] && options[:color] != 'RED')
+            attrs[:color] = options[:color]
+          end
+          if !attrs[:priority] || (options[:priority] && options[:priority] != 2)
+            attrs[:priority] = options[:priority]
+          end
+
+          @softbins[number] = attrs
+        end
+
+        def add_bin(number, options = {})
+          options = {
+            name:   nil,
+            result: 'FAIL'
+          }.merge(options)
+
+          attrs = @bins[number] || {}
+
+          attrs[:name] = options[:name] if options[:name]
+          if !attrs[:result] || (options[:result] && options[:result] != 'FAIL')
+            attrs[:result] = options[:result]
+          end
+
+          @bins[number] = attrs
+        end
+
+        def fully_formatted_filename
+          'limits.ods'
+        end
+
+        def subdirectory
+          "#{tester.package_namespace}/common"
+        end
+
+        def write_to_file(options = {})
+          Origen.log.info "Writing... #{output_file}"
+          spreadsheet = RODF::Spreadsheet.new
+          Origen.interface.flow_sheets.each do |name, flow|
+            if flow.limits_file
+              limits_name = flow.limits_file.filename.sub('.csv', '')
+              table = spreadsheet.table limits_name
+              flow.limits_file.output_file.readlines.each_with_index do |line, i|
+                # Need to fix the first row, SMT8 won't allow the Low/High limits cells not to be merged
+                if i == 0
+                  row = table.row
+                  x = nil
+                  line.chomp.split(',').each do |word|
+                    if word == 'Low Limit'
+                      x = 0
+                    elsif word == 'High Limit'
+                      row.cell 'Low Limit', span: x + 1
+                      x = 0
+                    elsif word == 'Unit'
+                      row.cell 'High Limit', span: x + 1
+                      row.cell word
+                      x = nil
+                    elsif x
+                      x += 1
+                    else
+                      row.cell word
+                    end
+                  end
+                else
+                  row = table.row
+                  line.chomp.split(',').each do |word|
+                    row.cell word
+                  end
+                end
+              end
+            end
+          end
+          if tester.separate_bins_file
+            bins_file = output_file.sub('.ods', '_bins.ods')
+            Origen.log.info "Writing... #{bins_file}"
+            bins_ss = RODF::Spreadsheet.new
+            add_bin_sheets(bins_ss)
+            bins_ss.write_to(bins_file)
+          else
+            add_bin_sheets(spreadsheet)
+          end
+          spreadsheet.write_to(output_file)
+        end
+
+        def add_bin_sheets(spreadsheet)
+          table = spreadsheet.table 'Software_Bins'
+          row = table.row
+          row.cell 'Software Bin'
+          row.cell 'Software Bin Name'
+          row.cell 'Hardware Bin'
+          row.cell 'Result'
+          row.cell 'Color'
+          row.cell 'Priority'
+          @softbins.each do |sbin, attrs|
+            row = table.row
+            row.cell sbin
+            row.cell attrs[:name]
+            row.cell attrs[:bin]
+            row.cell attrs[:result]
+            row.cell attrs[:color]
+            row.cell attrs[:priority]
+          end
+
+          # Write out the bin table
+          table = spreadsheet.table 'Hardware_Bins'
+          row = table.row
+          row.cell 'Hardware Bin'
+          row.cell 'Hardware Bin Name'
+          row.cell 'Result'
+          @bins.each do |bin, attrs|
+            row = table.row
+            row.cell bin
+            row.cell attrs[:name]
+            row.cell attrs[:result]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/origen_testers/smartest_based_tester/v93k_smt8/templates/limits.csv.erb

@@ -0,0 +1,3 @@
+% lines.each do |line|
+<%= line %>
+% end

data/lib/origen_testers/smartest_based_tester/v93k_smt8/templates/template.flow.erb

@@ -0,0 +1,41 @@
+flow <%= flow_name %> {
+% input_variables.each do |var|
+%   if var.is_a?(Array)
+    in <%= var[0].to_s %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
+%   else
+    in <%= var.to_s %> = -1;
+%   end
+% end
+
+% output_variables.each do |var|
+%   if var.is_a?(Array)
+    out <%= var[0].to_s %> = <%= var[1].is_a?(String) || var[1].is_a?(Symbol) ? "\"#{var[1]}\"" : var[1] %>;
+%   else
+    out <%= var.to_s %> = -1;
+%   end
+% end
+
+    setup {
+% test_suites.sorted_collection.each do |suite|
+%   suite.lines.each do |line|
+        <%= line %>
+%   end
+
+% end
+% sub_flows.each do |name, path|
+        flow <%= name %> calls <%= path %> { }
+% end
+    }
+
+    execute {
+% flow_header.each do |line|
+<%= line %>
+% end
+% lines.each do |line|
+<%= line %>
+% end
+% flow_footer.each do |line|
+<%= line %>
+% end
+    }
+}

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

@@ -0,0 +1,66 @@
+module OrigenTesters
+  module SmartestBasedTester
+    class V93K_SMT8
+      require 'origen_testers/smartest_based_tester/base/test_suite'
+      class TestSuite < Base::TestSuite
+        ATTRS =
+          %w(
+            name
+            comment
+
+            test_method
+
+            pattern
+            specification
+          )
+
+        ALIASES = {
+          spec:          :specification,
+          test_function: :test_method
+        }
+
+        DEFAULTS = {
+        }
+
+        # Generate accessors for all attributes and their aliases
+        ATTRS.each do |attr|
+          if attr == 'name' || attr == 'pattern'
+            attr_reader attr.to_sym
+          else
+            attr_accessor attr.to_sym
+          end
+        end
+
+        # Define the aliases
+        ALIASES.each do |_alias, val|
+          define_method("#{_alias}=") do |v|
+            send("#{val}=", v)
+          end
+          define_method("#{_alias}") do
+            send(val)
+          end
+        end
+
+        def lines
+          l = []
+          l << "suite #{name} calls #{test_method.klass} {"
+          if pattern && !pattern.to_s.empty?
+            l << "    measurement.pattern = setupRef(#{tester.package_namespace}.patterns.#{pattern});"
+          end
+          if specification && !specification.to_s.empty?
+            l << "    measurement.specification = setupRef(#{tester.package_namespace}.specs.#{specification});"
+          end
+          test_method.sorted_parameters.each do |param|
+            name = param[0]
+            unless name.is_a?(String)
+              name = name.to_s[0] == '_' ? name.to_s.camelize(:upper) : name.to_s.camelize(:lower)
+            end
+            l << "    #{name} = #{wrap_if_string(test_method.format(param[0]))};"
+          end
+          l << '}'
+          l
+        end
+      end
+    end
+  end
+end

data/lib/origen_testers/stil_based_tester/base.rb

@@ -252,6 +252,10 @@ module OrigenTesters
         Origen.log.warning "Call to match loop on pin #{pin.id} is not supported by the STIL generator and has been ignored"
       end
 
+      def match_block(timeout_in_cycles, options = {}, &block)
+        Origen.log.warning 'Call to match loop block is not supported by the STIL generator and has been ignored'
+      end
+
       # Add a loop to the pattern.
       #
       # Pass in the number of times to execute it, all vectors

data/lib/origen_testers/test/interface.rb

@@ -3,9 +3,13 @@ module OrigenTesters
     class Interface
       include OrigenTesters::ProgramGenerators
 
+      attr_accessor :include_additional_prb2_test
+      attr_reader :environment
+
       # Options passed to Flow.create and Library.create will be passed in here, use as
       # desired to configure your interface
       def initialize(options = {})
+        @environment = options[:environment]
       end
 
       # Test that the block form of flow control methods like this can
@@ -62,7 +66,12 @@ module OrigenTesters
             tm = test_methods.ac_tml.ac_test.functional_test
             ts = test_suites.run(name, options)
             ts.test_method = tm
-            ts.levels = options.delete(:pin_levels) if options[:pin_levels]
+            if tester.smt8?
+              ts.spec = options.delete(:pin_levels) if options[:pin_levels]
+              ts.spec ||= 'specs.Nominal'
+            else
+              ts.levels = options.delete(:pin_levels) if options[:pin_levels]
+            end
             if block
               ts.pattern = "#{name}_b#{i}"
             else
@@ -241,7 +250,12 @@ module OrigenTesters
           tm = test_methods.dc_tml.dc_test.general_pmu
           ts = test_suites.run(name, options)
           ts.test_method = tm
-          ts.levels = options.delete(:pin_levels) if options[:pin_levels]
+          if tester.smt8?
+            ts.spec = options.delete(:pin_levels) if options[:pin_levels]
+            ts.spec ||= 'specs.Nominal'
+          else
+            ts.levels = options.delete(:pin_levels) if options[:pin_levels]
+          end
           ts.lo_limit = options[:lo_limit] if options[:lo_limit]
           ts.hi_limit = options[:hi_limit] if options[:hi_limit]
           ts.pattern = name.to_s

data/lib/origen_testers/vector_generator.rb

@@ -280,6 +280,7 @@ module OrigenTesters
     # Vector objects (vector lines)
     #
     def format(vector_array, section)
+      tester_writing_pattern = respond_to?(:open_and_write_pattern)
       # Go through vector_array and print out both
       # vectors and non-vectors to pattern (via 'yield line')
       vector_array.each do |vec|
@@ -298,14 +299,14 @@ module OrigenTesters
         end
         pipeline.flush do |vector|
           expand_vector(vector) do |line|
-            yield line
+            yield line unless tester_writing_pattern
           end
         end
       end
       # now flush buffer if there is still a vector
       pipeline.empty(min_vectors: section == :footer ? @min_pattern_vectors : nil) do |vector|
         expand_vector(vector) do |line|
-          yield line
+          yield line unless tester_writing_pattern
         end
       end
     end
@@ -335,7 +336,7 @@ module OrigenTesters
       @dont_compress = val
     end
 
-    # expands (uncompresses to pattern) vector if desired or leaves it as is
+    # expands (un-compresses to pattern) vector if desired or leaves it as is
     # allows for tracking and formatting of vector
     # if comment then return without modification
     def expand_vector(vec)
@@ -349,10 +350,14 @@ module OrigenTesters
           yield track_and_format_vector(vec)
         end
       else
-        yield vec  # Return comments without modification
+        yield track_and_format_comment(vec)  # Return comments without modification
       end
     end
 
+    def track_and_format_comment(comment)
+      comment
+    end
+
     # Update tracking info (stats object) and allow for
     # any additional formatting via format_vector
     # method if overridden

data/lib/origen_testers/vector_pipeline.rb

@@ -23,7 +23,7 @@ module OrigenTesters
     end
 
     def push_microcode(code)
-      if $tester.v93k? && code =~ /JSUB/
+      if $tester.v93k? && $tester.smt_version == 7 && code =~ /JSUB/
         @vector_count += 1
       end
       comments << code

data/pattern/nvm/v93k/v93k_workout.rb

@@ -72,6 +72,13 @@ Pattern.create do
                :pin2 => $nvm.pin(:fail), :state2 => :low)
   $nvm.pin(:fail).assert(0)
 
+  ss "Test a block match loop"
+  tester.wait match: true, time_in_us: 5000 do
+    $nvm.pin(:done).assert(1)
+    $nvm.pin(:fail).assert(1)
+    1.cycle
+  end
+
   ss "Test looping, these vectors should be executed once"
   $tester.loop_vector("test_loop_1", 1) do
     $nvm.pins(:porta).drive(0xAA)

data/program/_erase_vfy.rb

@@ -1,5 +1,6 @@
 Flow.create do |options|
 
-  func :margin_read1_all1, number: options[:number]
+  # Added set-flag to test that manually set flags are brought up to the top-level for SMT8
+  func :margin_read1_all1, number: options[:number], on_fail: { set_flag: :ers_vfy_failed }
 
 end

data/program/components/_deep_nested.rb

@@ -0,0 +1,3 @@
+Flow.create do |options|
+  test :deep_test, id: :deep_test
+end

data/program/components/_prb1_main.rb

@@ -226,5 +226,5 @@ Flow.create do |options|
     func "cc_test_#{i}".to_sym, number: 7000 + i
   end
 
-  pass 1, description: "Good die!", softbin: 1
+  import 'deep_nested'
 end

data/program/components/_prb2_main.rb

@@ -1,6 +1,10 @@
 Flow.create do |options|
 
-  func :pgm_ckbd, number: options[:number] + 10
-  func :mrd_ckbd, number: options[:number] + 20
+  if environment == :probe
+    func :pgm_ckbd, number: options[:number] + 10
+    func :mrd_ckbd, number: options[:number] + 20
+  end
+
+  self.include_additional_prb2_test = true
 
 end

data/program/flow_control.rb

@@ -434,13 +434,13 @@ Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Contro
     func :test2, unless_flag: :$Alarm, number: 51950
 
     # The is auto-generated comment from hashtag
-    func_with_comment :test1
+    func_with_comment :test1, number: 51952
 
     cc 'The is auto-generated comment from cc'
-    func_with_comment :test1
+    func_with_comment :test1, number: 51954
 
     log 'Use bin_attrs to set not_over_on'
-    func :test1n, number: 51960, bin: 12, bin_attrs: { not_over_on: true }
+    func :test1n, number: 51956, bin: 12, bin_attrs: { not_over_on: true }
 
   end