origen_testers 0.52.2 → 0.52.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc68d0b072cf46956e8af1c821d6c786e3a2293d92b7f18b2562d7494794909
-  data.tar.gz: 439d5555e5b2f5aa4bc9675b540e9749300971ac3b0b789af181ebba8b860c78
+  metadata.gz: 5349ea4cd6f5b1ed7997b2565c6eda09ad601070a71195d40375d1f70faab52d
+  data.tar.gz: 571441a791984b34c8fe1205a05ede6fe1b6f89973d090fc2e6f7ba52da51a35
 SHA512:
-  metadata.gz: c58c6ec7dabf1aea38f10934367e0bae4dc6a4131bd0ad9dcd0803a8a719e7113862a156801d144ac166f6da2861aa2afb096675ed2e859e7e7ce6b8b707e8c1
-  data.tar.gz: e7f4e559cab595f3858a62a4103cf99b6827429ec268b60890fcd62ab7e57c62c2b101d725463fe12a9007ea5a782fbe2ff31a559d46ca5673749ff9479cd8e2
+  metadata.gz: 1b133340695a1ddab2db3f1e651748b15eebeb1f524866efcf04e1f5ca45bbfacfd753be0a31cd5b6c99b51b47df4c78229c09699c4271c4b03c57ef8760bcf7
+  data.tar.gz: 45fd99e42edb9e438ec6930eeb6bc4a492e8f70f957cae8ffb2187863087c39b8f0bf97adfac9c6330e1374ebf457b158eddcbeca194d2affbd5fb1f0d30e355

data/config/version.rb

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

data/lib/origen_testers/atp/flow.rb

@@ -626,32 +626,37 @@ module OrigenTesters::ATP
     end
 
     def loop(*args, &block)
-      unless args[0].keys.include?(:from) && args[0].keys.include?(:to)
-        fail 'Loop must specify :from, :to'
-      end
-      # assume 1 if :step not provided
-      unless args[0].keys.include?(:step)
-        args[0][:step] = 1
-      end
-      # assume 1 if :test_num_inc not provided
-      unless args[0].keys.include?(:test_num_inc)
-        args[0][:test_num_inc] = 1
-      end
-      # Add node for set of flag to be used for loop
-      unless args[0][:var].nil?
-        unless tester.smt8?
-          set(args[0][:var], 0)
+      if args[0].except(:source_file, :source_line_number).empty?
+        # not a flow api call, just a loop block
+        super(&block)
+      else
+        unless args[0].keys.include?(:from) && args[0].keys.include?(:to)
+          fail 'Loop must specify :from, :to'
         end
-      end
-      extract_meta!(options) do
-        apply_conditions(options) do
-          # always pass 5-element array to loop node to simplify downstream parser
-          #   element, 'var', will be nil if not specified by loop call
-          params = [args[0][:from], args[0][:to], args[0][:step], args[0][:var], args[0][:test_num_inc]]
+        # assume 1 if :step not provided
+        unless args[0].keys.include?(:step)
+          args[0][:step] = 1
+        end
+        # assume 1 if :test_num_inc not provided
+        unless args[0].keys.include?(:test_num_inc)
+          args[0][:test_num_inc] = 1
+        end
+        # Add node for set of flag to be used for loop
+        unless args[0][:var].nil?
+          unless tester.smt8?
+            set(args[0][:var], 0)
+          end
+        end
+        extract_meta!(options) do
+          apply_conditions(options) do
+            # always pass 5-element array to loop node to simplify downstream parser
+            #   element, 'var', will be nil if not specified by loop call
+            params = [args[0][:from], args[0][:to], args[0][:step], args[0][:var], args[0][:test_num_inc]]
 
-          node = n(:loop, params)
-          node = append_to(node) { block.call }
-          node
+            node = n(:loop, params)
+            node = append_to(node) { block.call }
+            node
+          end
         end
       end
     end

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

@@ -50,8 +50,7 @@ module OrigenTesters
                 parents.unshift(File.basename(f.filename, '.*').to_s.downcase)
                 f = f.parent
               end
-              # need to variablize this for internal usage!!
-              if Origen.interface.respond_to?(:insertion)
+              if Origen.interface.respond_to?(:insertion) && tester.insertion_in_the_flow_path
                 File.join tester.package_namespace, Origen.interface.insertion.to_s, 'flows', *parents
               else
                 File.join tester.package_namespace, 'flows', *parents

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

@@ -132,8 +132,10 @@ module OrigenTesters
             "#{val}[Hz]"
           when :string
             val.to_s
-          when :integer, :double
-            val
+          when :integer
+            val.to_i
+          when :double
+            val.to_f
           when :boolean
             # Check for valid values
             if [0, 1, true, false, 'true', 'false'].include?(val)
@@ -198,6 +200,10 @@ module OrigenTesters
           end
         end
 
+        def remove_parameter(name)
+          @parameters.delete(name)
+        end
+
         private
 
         def inverse_of(type)

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -83,6 +83,10 @@ module OrigenTesters
       # (SMT8 only)
       attr_accessor :print_all_params
 
+      # When set to true, the flow path will have insertion in the subdirectories
+      # (SMT8 only)
+      attr_reader :insertion_in_the_flow_path
+
       def initialize(options = {})
         options = {
           # whether to use multiport bursts or not, if so this indicates the name of the port to use
@@ -132,6 +136,7 @@ module OrigenTesters
         @capture_style = :hram			# default to use hram for capture
         @overlay_subr = nil
         @overlay_history = {} # used to track labels, subroutines, digsrc pins used etc
+        @insertion_in_the_flow_path = options[:insertion_in_the_flow_path] # add insertion for path to the flows
 
         if options[:add_flow_enable]
           self.add_flow_enable = options[:add_flow_enable]

data/lib/origen_testers/test/custom_test_interface.rb

@@ -33,6 +33,20 @@ module OrigenTesters
         end
       end
 
+      def custom_c(name, options = {})
+        name = "custom_c_#{name}".to_sym
+        if tester.v93k?
+          ti = test_methods.my_tml.test_c
+          ti.my_arg0 = 'arg0_set'
+          if options[:my_arg1]
+            ti.my_arg0 = 'arg1_should_render'
+            ti.my_arg1 = options[:my_arg1]
+          else
+            ti.my_arg0 = 'arg1_should_not_render'
+          end
+        end
+      end
+
       def custom_hash(name, options = {})
         name = "custom_hash_#{name}".to_sym
         if tester.v93k? && tester.smt8?
@@ -96,6 +110,25 @@ module OrigenTesters
                   my_arg0:             [:string, ''],
                   my_arg1:             [:string, 'b_default_value']
                 },
+                test_c:    {
+                  tester_state: [:string, 'CONNECTED', %w(CONNECTED UNCHANGED)],
+                  test_name:    [:string, 'Functional'],
+                  my_arg0:      [:string, ''],
+                  my_arg1:      [:string, 'DELETE_ME'],
+                  my_arg2:      [:string, 'VOLT', %w(VOLT CURR)],
+
+                  # Define any methods you want the test method to have
+                  methods:      {
+                    # An optional finalize function can be supplied to do any final test instance configuration, this
+                    # function will be called immediately before the test method is finally rendered. The test method
+                    # object itself will be passed in as an argument.
+                    finalize:    lambda  do |tm|
+                      if tm.my_arg1 == 'DELETE_ME'
+                        tm.remove_parameter(:my_arg1)
+                      end
+                    end
+                  }
+                },
                 test_hash: {
                   # Parameters can be defined with an underscored symbol as the name, this can be used
                   # if the C++ implementation follows the standard V93K convention of calling the attribute

data/lib/origen_testers/test/interface.rb

@@ -61,7 +61,8 @@ module OrigenTesters
                     param_list_strings: [:list_strings, %w(E1 E2)],
                     param_list_classes: [:list_classes, %w(E1 E2)],
                     param_name1:        [{
-                      param_name0:        [:integer, 0],
+                      param_name_int:     [:integer, 0],
+                      param_name_double:  [:double,  0],
                       param_list_strings: [:list_strings, %w(E1 E2)],
                       param_list_classes: [:list_classes, %w(E1 E2)]
                     }]
@@ -69,10 +70,23 @@ module OrigenTesters
                   'nestedHashParameter2': [{
                     param_name0: [:string, ''],
                     param_name1: [{
-                      param_name0: [:integer, 0]
+                      param_name_int: [:integer, 0]
                     }]
                   }]
                 }
+        add_tml :my_type_check,
+                class_name:         'MyTypeCheck',
+
+                # Here is a test definition.
+                # The identifier should be lower-cased and underscored, in-keeping with Ruby naming conventions.
+                # By default the class name will be the camel-cased version of this identifier, so 'myTest' in
+                # this case.
+                my_type_check_test: {
+                  # [OPTIONAL] The C++ test method class name can be overridden from the default like this:
+                  class_name: 'MyHashExampleClass',
+                  int:        [:integer, 1],
+                  double:     [:double,  1.0]
+                }
       end
 
       def add_charz
@@ -279,6 +293,21 @@ module OrigenTesters
         end
       end
 
+      def double_int_type_check(name, options = {})
+        number = options[:number]
+        if tester.v93k?
+          block_loop(name, options) do |block, i|
+            options[:number] = number + i if number && i
+            tm = test_methods.my_type_check.my_type_check_test
+            tm.int    = '1'
+            tm.double = '1.0'
+            ts = test_suites.run(name, options)
+            ts.test_method = tm
+            flow.test ts, options
+          end
+        end
+      end
+
       def my_hash_test(name, options = {})
         number = options[:number]
 
@@ -294,13 +323,15 @@ module OrigenTesters
                 param_name0: 'hello',
                 param_name1: {
                   my_param_name1: {
-                    param_name0: 1
+                    param_name_int:    '1',
+                    param_name_double: '1.0'
                   },
                   my_param_name2: {
-                    param_name0: 2
+                    param_name_int:    2,
+                    param_name_double: 2.0
                   },
                   my_param_name3: {
-                    param_name0: 3
+                    param_name_int: 3
                   }
                 }
               }
@@ -313,6 +344,7 @@ module OrigenTesters
                 param_name0: 'goodbye forever'
               }
             }
+            tm.samples = '2'
             ts = test_suites.run(name, options)
             ts.test_method = tm
             ts.spec = options.delete(:pin_levels) if options[:pin_levels]

data/program/components/_prb1_main.rb

@@ -257,4 +257,6 @@ Flow.create do |options|
     func :force_serial_false_test, force_serial: false
   end
 
+  double_int_type_check :type_check, number: 6035
+
 end

data/program/custom_tests.rb

@@ -12,5 +12,8 @@ Flow.create interface: 'OrigenTesters::Test::CustomTestInterface', flow_descript
     if tester.smt8?
       custom_hash :test5, number: 30050
     end
+
+    custom_c :test6, number: 30060
+    custom_c :test7, number: 30070, my_arg1: 'KEEP_ME'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.52.2
+  version: 0.52.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -156,6 +156,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.24'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.24'
 description: 
 email:
 - stephen.f.mcginty@gmail.com