origen_testers 0.40.0 → 0.41.0

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

@@ -7,6 +7,7 @@ module OrigenTesters
           attr_accessor :lo_limit, :hi_limit
           attr_accessor :unit
           attr_accessor :tnum
+          attr_accessor :render
           alias_method :lo, :lo_limit
           alias_method :lo=, :lo_limit=
           alias_method :hi, :hi_limit
@@ -15,6 +16,7 @@ module OrigenTesters
           def initialize(test_method)
             @test_method = test_method
             @tnum = ''
+            @render = true
           end
 
           def unit=(val)
@@ -63,6 +65,10 @@ module OrigenTesters
             r
           end
 
+          def render?
+            @render
+          end
+
           private
 
           def test_name

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

@@ -100,7 +100,7 @@ module OrigenTesters
           f << 'ffv_enable' if ffv_enable
           f << 'frg_enable' if frg_enable
           f << 'hw_dsp_disable' if hardware_dsp_disable
-          f.join(', ')
+          f.empty? ? f : f.join(', ')
         end
 
         def wrap_if_string(value)

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

@@ -38,7 +38,8 @@ module OrigenTesters
           (variables[:all][:referenced_enables] + variables[:all][:set_enables]).uniq.sort do |x, y|
             x = x[0] if x.is_a?(Array)
             y = y[0] if y.is_a?(Array)
-            x <=> y
+            # Need to use strings for the comparison as some flags can be a string and some a symbol
+            x.to_s <=> y.to_s
           end
         end
 
@@ -47,7 +48,8 @@ module OrigenTesters
           (variables[:all][:jobs] + variables[:all][:referenced_flags] + variables[:all][:set_flags]).uniq.sort do |x, y|
             x = x[0] if x.is_a?(Array)
             y = y[0] if y.is_a?(Array)
-            x <=> y
+            # Need to use strings for the comparison as some declarations can be a string and some a symbol
+            x.to_s <=> y.to_s
           end
         end
 

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

@@ -138,11 +138,11 @@ testmethodlimits
 %   end
 % else
 %   test_methods.sorted_collection.each do |method|
-%     if method.respond_to?(:limits) && method.limits
-%     unless at_least_one
+%     if method.respond_to?(:limits) && method.limits && method.limits.render?
+%       unless at_least_one
 
-%       at_least_one = true
-%     end
+%         at_least_one = true
+%       end
 <%= method.id %>:
   <%= method.limits %>;
 %     end

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

@@ -36,6 +36,9 @@ module OrigenTesters
              ffv_enable
              frg_enable
              hardware_dsp_disable
+             site_control
+             site_match
+             force_serial
           )
 
         ALIASES = {
@@ -66,7 +69,9 @@ module OrigenTesters
           pass_value:      true,
           fail_value:      true,
           per_pin_on_pass: true,
-          per_pin_on_fail: true
+          per_pin_on_fail: true,
+          site_control:    'parallel:',
+          site_match:      2
         }
 
         # Generate accessors for all attributes and their aliases
@@ -95,7 +100,7 @@ module OrigenTesters
           l = []
           l << "  comment = \"#{comment}\";" if comment
           l << "  ffc_on_fail = #{wrap_if_string(log_first)};" if log_first
-          l << "  local_flags = #{flags};"
+          l << "  local_flags = #{flags};" unless flags.empty?
           l << '  override = 1;'
           l << "  override_anaset = #{wrap_if_string(analog_set)};" if analog_set
           l << "  override_lev_equ_set = #{wrap_if_string(level_equation)};" if level_equation
@@ -107,9 +112,10 @@ module OrigenTesters
           l << "  override_tim_equ_set = #{wrap_if_string(timing_equation)};" if timing_equation
           l << "  override_tim_spec_set = #{wrap_if_string(timing_spec)};" if timing_spec
           l << "  override_timset = #{wrap_if_string(timing_set)};" if timing_set
-          l << '  site_control = "parallel:";'
-          l << '  site_match = 2;'
+          l << "  site_control = #{wrap_if_string(site_control)};" if site_control
+          l << "  site_match = #{wrap_if_string(site_match)};" if site_match
           l << "  test_level = #{test_level};" if test_level
+          l << "  force_serial = #{wrap_if_string(force_serial)};" if force_serial
           l
         end
       end

data/lib/origen_testers/test/custom_test_interface.rb

@@ -25,6 +25,14 @@ module OrigenTesters
         end
       end
 
+      def custom_b(name, options = {})
+        name = "custom_b_#{name}".to_sym
+        if tester.v93k?
+          ti = test_methods.my_tml.test_b
+          ti.my_arg0 = 'arg0_set'
+        end
+      end
+
       private
 
       def add_custom_tml
@@ -70,6 +78,11 @@ module OrigenTesters
                       tm.my_arg4 = val
                     end
                   }
+                },
+                test_b: {
+                  render_limits_in_tf: false,
+                  my_arg0:             [:string, ''],
+                  my_arg1:             [:string, 'b_default_value']
                 }
       end
 

data/lib/origen_testers/test/dut.rb

@@ -10,6 +10,7 @@ module OrigenTesters
       attr_accessor :digcap_pins
       attr_accessor :digsrc_settings
       attr_accessor :digcap_settings
+      attr_accessor :target_load_count
 
       include OrigenARMDebug
       include Origen::TopLevel
@@ -24,6 +25,8 @@ module OrigenTesters
           test_generic_overlay_capture: options[:test_generic_overlay_capture]
         }
 
+        @target_load_count = 0
+
         add_pin :tclk
         add_pin :tdi
         add_pin :tdo
@@ -75,6 +78,10 @@ module OrigenTesters
         end
       end
 
+      def on_load_target
+        @target_load_count += 1
+      end
+
       def startup(options)
         $tester.set_timeset('tp0', 60)
       end

data/program/components/_prb1_main.rb

@@ -226,5 +226,26 @@ Flow.create do |options|
     func "cc_test_#{i}".to_sym, number: 7000 + i
   end
 
+  # Ensure that mixed flag types work
+  if tester.smt7?
+    log 'Passing test flags of mixed types works as expected'
+    if_enable [:sym_flag, "$StringFLag"] do
+      func :mixed_flag_check
+    end
+  end
+
   import 'deep_nested'
+
+  if tester.smt7?
+    log 'Passing test flags works as expected'
+    func :test_with_no_flags, bypass: false, output_on_pass: false, output_on_fail: false, value_on_pass: false, value_on_fail: false, per_pin_on_pass: false, per_pin_on_fail: false, number: 6020
+    func :test_with_flags, bypass: true, output_on_pass: true, output_on_fail: true, value_on_pass: true, value_on_fail: true, per_pin_on_pass: true, per_pin_on_fail: true, number: 6030
+  end
+
+  if tester.smt7?
+    log 'force_serial test method parameter can be programmed'
+    func :force_serial_true_test, force_serial: true
+    func :force_serial_false_test, force_serial: false
+  end
+
 end

data/program/custom_tests.rb

@@ -7,4 +7,7 @@ Flow.create interface: 'OrigenTesters::Test::CustomTestInterface', flow_descript
 
   custom :test3, number: 30020
 
+  if tester.v93k?
+    custom_b :test4, number: 30040
+  end
 end

data/program/flow_control.rb

@@ -474,4 +474,51 @@ Flow.create interface: 'OrigenTesters::Test::Interface', flow_name: "Flow Contro
     end
   end
 
+  if tester.v93k?
+    log 'Test some expressions'
+    set '$LT_VARIABLE', "FALSE"
+
+    whenever lt(3, 5) do
+      set '$LT_VARIABLE', "TRUE"
+      func :test_3lt5, number: 55000
+    end
+
+    whenever eq('$LT_VARIABLE', "TRUE") do
+      bin 12
+    end
+
+    whenever_any gt('$FIVE', '$FOUR'), ne(5, 4) do
+      func :test_5gt4_or_4gt5, number: 55002
+    end
+
+    whenever_all ge('$FIVE_PNT_TWO', 5.1), lt(4, 3) do
+      func :test_5gt4_and_4gt3, number: 55004
+    end
+
+  end
+
+  if tester.igxl?
+    log "Test that if_any_site_failed works"
+    func :read1, id: :ta1, bin: 10, number: 60000
+    func :erase1, if_any_site_failed: :ta1, bin: 12, number: 60010
+
+    log "Test the block form of if_any_site_failed"
+    func :read2, id: :ta2, bin: 10, number: 60020
+    if_any_site_failed :ta2 do
+      func :erase2, number: 60030
+      func :erase2, number: 60040
+    end
+
+    log "Test that if_all_sites_failed works"
+    func :read1, id: :ta3, bin: 10, number: 60000
+    func :erase1, if_all_sites_failed: :ta3, bin: 12, number: 60010
+
+    log "Test that if_any_sites_passed works"
+    func :read1, id: :ta4, bin: 10, number: 60000
+    func :erase1, if_any_sites_passed: :ta4, bin: 12, number: 60010
+
+    log "Test that if_all_sites_passed works"
+    func :read1, id: :ta5, bin: 10, number: 60000
+    func :erase1, if_all_sites_passed: :ta5, bin: 12, number: 60010
+  end
 end