origen_testers 0.51.1 → 0.51.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f96fa1f3c65b7ab6cd0fb2c25abb378ef0cd0d9489a05cc7c94eb05becf628
-  data.tar.gz: 0d465b02299aceb26467727fd021736b78c959d46ece03fddd0c581495291e3d
+  metadata.gz: d1ba41af6b65ac674916979e0732f2ec945cd3871a9764ed26eed0c1fc9ad9df
+  data.tar.gz: 63be076e3b7dfc1dfa525b420b233b8a79eb33f6c86a06852f0069f01cfd7668
 SHA512:
-  metadata.gz: d08fd272bc3331a87ac33011d22386e535981d376c0c995c4d3605794e6a7c3be7d755f69b0d851e22bf398692e98b516ce19999860e4b46fbba7af3ee1123e2
-  data.tar.gz: b754e33f7577da5f100e93cb7b020ad8abf014e8e7b102d17e07bace411ff5e20df0c47e5e033f74fab814ccda0bc6b89fc1b2e5e768b8cb13b9e2e03ae4a32e
+  metadata.gz: 13f984fad6402b0749eaa3029aa8ccecf3870f6e534c553884a6dc6de42a11b4383e268378ec84968b7e71ce2ed75b800fe9c8f7128f37c32e3b1b78a7d70ec7
+  data.tar.gz: a4b421dfd78750be92b44112ca13506a6f281a98ee9f84faa3ccf49b08a4e1f32fecfe979aa7f2eafb4f66a1875a66ad092949d39bd7638ccdbfb6ba812308a6

data/config/version.rb

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

data/lib/origen_testers/charz/profile.rb

@@ -19,7 +19,7 @@ module OrigenTesters
       #   @return [Array] list of charz routines to be called under this profile
       # @!attribute charz_only
       #   @return [Boolean] indicates if the point tests should or shouldn't be added to the flow
-      attr_accessor :id, :name, :placement, :on_result, :enables, :flags, :routines, :charz_only
+      attr_accessor :id, :name, :placement, :on_result, :enables, :flags, :routines, :charz_only, :and_enables, :and_flags
 
       def initialize(id, options, &block)
         @id = id
@@ -74,8 +74,20 @@ module OrigenTesters
         end
 
         unless @gate_checks == false
-          gate_check(@enables, :enables) if @enables
-          gate_check(@flags, :flags) if @flags
+          if @and_enables && @and_flags
+            Origen.log.error "@and_enables and @and_flags are both set to true. Please only 'and' one gate type"
+            fail
+          end
+          if @and_enables
+            gate_check(@flags, :flags) if @flags
+            gate_check_and(@enables, :enables, @flags) if @enables
+          elsif @and_flags
+            gate_check(@enables, :enables) if @enables
+            gate_check_and(@flags, :flags, @enables) if @flags
+          else
+            gate_check(@enables, :enable) if @enables
+            gate_check(@flags, :flags) if @flags
+          end
         end
       end
 
@@ -112,6 +124,46 @@ module OrigenTesters
         end
       end
 
+      def gate_check_and(gates, gate_type, other_gate)
+        if other_gate.is_a? Hash
+          Origen.log.error "Profile #{id}: #{other_gate} When using &&-ing feature, the non-anded gate can not be of type hash."
+          fail
+        end
+        case gates
+        when Symbol, String
+          return
+        when Array
+          unknown_gates = gates.reject { |gate| [String, Symbol].include? gate.class }
+          if unknown_gates.empty?
+            return
+          else
+            Origen.log.error "Profile #{id}: Unknown #{gate_type} type(s) in #{gate_type} array."
+            Origen.log.error "Arrays must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq } were found in #{gates}"
+            fail
+          end
+        when Hash
+          gates.each do |gated_routine, gates|
+            if gated_routine.is_a? Hash
+              Origen.log.error "Profile #{id}: #{gate_type} Hash keys cannot be of type Hash, but only Symbol, String, or Array"
+              fail
+            end
+            unless @defined_routines.include?(gated_routine)
+              Origen.log.error "Profile #{id}: #{gated_routine} Hash keys for &&-ed gates must be defined routines."
+              fail
+            end
+            gates = [gates] unless gates.is_a? Array
+            unknown_gates = gates.reject { |gate| [String, Symbol].include? gate.class }
+            unless unknown_gates.empty?
+              Origen.log.error "Gate array must contain Strings and/or Symbols, but #{unknown_gates.map(&:class).uniq } were found in #{gates}"
+              fail
+            end
+          end
+        else
+          Origen.log.error "Profile #{id}: Unknown #{gate_type} type: #{gates.class}. #{gate_type} must be of type Symbol, String, Array, or Hash"
+          fail
+        end
+      end
+
       def method_missing(m, *args, &block)
         ivar = "@#{m.to_s.gsub('=', '')}"
         ivar_sym = ":#{ivar}"

data/lib/origen_testers/charz/session.rb

@@ -16,12 +16,13 @@ module OrigenTesters
           @defaults = options[:defaults]
         else
           @defaults = {
-            placement:  :inline,
-            on_result:  nil,
-            enables:    nil,
-            flags:      nil,
-            name:       'charz',
-            charz_only: false
+            placement:   :inline,
+            on_result:   nil,
+            enables:     nil,
+            flags:       nil,
+            enables_and: nil,
+            name:        'charz',
+            charz_only:  false
           }
         end
       end
@@ -53,6 +54,17 @@ module OrigenTesters
           return @valid
         end
         @defined_routines = options.delete(:defined_routines)
+
+        if charz_obj.and_flags
+          @and_flags = charz_obj.and_flags
+        else
+          @and_flags = false
+        end
+        if charz_obj.and_enables
+          @and_enables = charz_obj.and_enables
+        else
+          @and_enables = false
+        end
         assign_by_priority(:placement, charz_obj, options)
         assign_by_priority(:on_result, charz_obj, options)
         assign_by_priority(:enables, charz_obj, options)

data/lib/origen_testers/charz.rb

@@ -334,13 +334,102 @@ module OrigenTesters
     #
     # This is the final method of handling the insert_charz_test usecases, where the block thats been passed around is finally called
     # the user's provided block is passed the current routine (one at a time) to then take its info to generate a charz test
+
+    # Pass an "and_if_true" variable for enables and flags? And use that to to decide what to do? Then we don't need 4.
+    # But the hash has to be structured a different way for the enable_and (routine is key, enables is value.)
     def process_gates(options, &block)
       if options[:skip_gates] || !(charz_session.enables || charz_session.flags)
         charz_session.routines.each do |routine|
           block.call(options.merge(current_routine: routine))
         end
       else
-        if charz_session.enables && charz_session.flags
+        if charz_session.and_enables
+          if charz_session.flags
+            # Wrap all tests in flag, wrap some tests in anded enables.
+            ungated_routines = charz_session.routines - charz_session.enables.keys
+            ungated_routines.each do |routine|
+              if_flag charz_session.flags do
+                block.call(options.merge(current_routine: routine))
+              end
+            end
+            gated_routines = charz_session.routines - ungated_routines
+            # Build the proc which contains the nested if statements for each routine so they are anded.
+            gated_routines.each do |routine|
+              my_proc = -> do
+                if_flag charz_session.flags do
+                  block.call(options.merge(current_routine: routine))
+                end
+              end
+              charz_session.enables[routine].inject(my_proc) do |my_block, enable|
+                lambda do
+                  if_enable :"#{enable}" do
+                    my_block.call
+                  end
+                end
+              end.call
+            end
+          else
+            ungated_routines = charz_session.routines - charz_session.enables.keys
+            ungated_routines.each do |routine|
+              block.call(options.merge(current_routine: routine))
+            end
+            # Build the proc which contains the nested if statements for each routine so they are anded.
+            gated_routines = charz_session.routines - ungated_routines
+            gated_routines.each do |routine|
+              my_proc = -> { block.call(options.merge(current_routine: routine)) }
+              charz_session.enables[routine].inject(my_proc) do |my_block, enable|
+                lambda do
+                  if_enable :"#{enable}" do
+                    my_block.call
+                  end
+                end
+              end.call
+            end
+          end
+        elsif charz_session.and_flags
+          if charz_session.enables
+            # Wrap all tests in enable, some tests in anded flags.
+            ungated_routines = charz_session.routines - charz_session.flags.keys
+            ungated_routines.each do |routine|
+              if_enable charz_session.enables do
+                block.call(options.merge(current_routine: routine))
+              end
+            end
+            # Build the proc which contains the nested if statemements for each routine so they are anded.
+            gated_routines = charz_session.routines - ungated_routines
+            gated_routines.each do |routine|
+              my_proc = -> do
+                if_enable charz_session.enables do
+                  block.call(options.merge(current_routine: routine))
+                end
+              end
+              charz_session.flags[routine].inject(my_proc) do |my_block, flag|
+                lambda do
+                  if_flag :"#{flag}" do
+                    my_block.call
+                  end
+                end
+              end.call
+            end
+          else
+            ungated_routines = charz_session.routines - charz_session.flags.keys
+            ungated_routines.each do |routine|
+              block.call(options.merge(current_routine: routine))
+            end
+            # Build the proc which contains the nested if statemements for each routine so they are anded.
+            gated_routines = charz_session.routines - ungated_routines
+            gated_routines.each do |routine|
+              my_proc = -> { block.call(options.merge(current_routine: routine)) }
+              charz_session.flags[routine].inject(my_proc) do |my_block, flag|
+                lambda do
+                  if_flag :"#{flag}" do
+                    my_block.call
+                  end
+                end
+              end.call
+            end
+          end
+        elsif charz_session.enables && charz_session.flags
           if charz_session.enables.is_a?(Hash) && !charz_session.flags.is_a?(Hash)
             # wrap all tests in flags, wrap specific tests in enables
             if_flag charz_session.flags do

data/lib/origen_testers/test/interface.rb

@@ -50,6 +50,28 @@ module OrigenTesters
           profile.enables = { ['$MyEnable1'] => [:routine1], ['$MyEnable2'] => [:routine2, :routine3], '$MyEnable3' => :routine5 }
           profile.routines = [:routine1, :routine2, :routine3, :routine4, :routine5, :routine6]
         end
+
+        add_charz_profile :simple_anded_flags do |profile|
+          profile.and_flags = true
+          profile.routines = [:routine1]
+        end
+
+        add_charz_profile :simple_anded_enables do |profile|
+          profile.and_enables = true
+          profile.routines = [:routine1]
+        end
+
+        add_charz_profile :complex_anded_flags do |profile|
+          profile.and_flags = true
+          profile.enables = :my_enable
+          profile.routines = [:routine1]
+        end
+
+        add_charz_profile :complex_anded_enables do |profile|
+          profile.and_enables = true
+          profile.flags = :my_flag
+          profile.routines = [:routine1]
+        end
       end
 
       # Test that the block form of flow control methods like this can

data/program/charz.rb

@@ -7,11 +7,11 @@ Flow.create interface: 'OrigenTesters::Test::Interface' do
 
   if tester.v93k? && tester.smt7?
     charz_on :complex_gates, { on_result: :fail }
-    func_with_charz :func_complex_gates_on_fail
+      func_with_charz :func_complex_gates_on_fail
     charz_off
 
     charz_on :complex_gates, { enables: :my_enable }
-    func_with_charz :func_complex_flag_simple_enable
+      func_with_charz :func_complex_flag_simple_enable
     charz_off
 
     charz_on :complex_gates, { flags: :my_flag } do
@@ -19,17 +19,17 @@ Flow.create interface: 'OrigenTesters::Test::Interface' do
     end
 
     charz_on :cz_only, { placement: :eof }
-    func_with_charz :func_charz_only
+      func_with_charz :func_charz_only
     charz_off
 
     func_with_charz :func_test_level_routine, charz: [:routine1, { type: :routine }]
 
     charz_on :cz
-    func_with_charz :func_skip_group, skip_group: true
-    charz_pause
-    func_with_charz :func_pause_charz
-    charz_resume
-    func_with_charz :func_resume_charz
+      func_with_charz :func_skip_group, skip_group: true
+      charz_pause
+      func_with_charz :func_pause_charz
+      charz_resume
+      func_with_charz :func_resume_charz
     charz_off
 
     charz_on :simple_gates, { on_result: :pass } do 
@@ -43,6 +43,22 @@ Flow.create interface: 'OrigenTesters::Test::Interface' do
     charz_on :simple_gates, { flags: nil }
     func_with_charz :func_simple_enables
     charz_off
-  end
 
+    charz_on :simple_anded_flags, { flags: { routine1: [:my_flag1, :my_flag2]}}
+    func_with_charz :func_simple_anded_flags
+    charz_off
+
+    charz_on :simple_anded_enables, {enables: { routine1: [:my_enable1, :my_enable2]}}
+      func_with_charz :func_simple_anded_enables
+    charz_off
+    
+    charz_on :complex_anded_flags, {flags: { routine1: [:my_flag1, :my_flag2]}}
+      func_with_charz :func_complex_anded_flags
+    charz_off
+
+    charz_on :complex_anded_enables, {enables: { routine1: [:my_enable1, :my_enable2]}}
+      func_with_charz :func_complex_anded_enables
+    charz_off
+
+  end
 end

data/templates/origen_guides/program/charz.md.erb

@@ -48,7 +48,7 @@ end
 Charz profiles contain a collection of routines, as well as test creation meta data related to test placement, production test result dependence, and conditional execution.
 
 The interface adds charz profiles by calling the `add_charz_profile` method. To create a profile that contains previously defined vmin and vmax search routines, whose resulting searches
-only run if the production test failed, and sets the vmax search routine to only run if the 'VmaxEnable' variable is set:
+only run if the production test failed, and sets the vmax search routine to only run if the 'VmaxEnable' variable is set. 
 
 ~~~ruby
 add_charz_profile :fail_searches do |profile|
@@ -59,6 +59,26 @@ add_charz_profile :fail_searches do |profile|
 end
 ~~~
 
+The default behavior for gates is to "OR" them if multiple are defined. The below will result in each routine being nested inside 'my_enable1 or my_enable2'.
+~~~ruby
+add_charz_profile :enables do |profile|
+  profile.name = 'enables'
+  profile.routines = [:vmin, :vmax]
+  profile.enables = [:my_enable1, :my_enable2]
+end
+~~~
+
+The profile can be updated to "AND" together multiple enables or flags. To set up this functionality
+create a hash which maps a routine name to multiple flags and set the corresponding "and_" profile attribute to true.
+~~~ruby
+add_charz_profile :anded_enables do |profile|
+  profile.name = 'anded_enables'
+  profile.routines = [:vmin, :vmax]
+  profile.and_enables = true
+  profile.enables = { vmin: [:overall_enable, :vmin_enable], vmax: [:overall_enable, :vmax_enable]}
+end
+~~~
+
 ### Charz Session
 
 The charz session (stored in your interfaces `@charz_session` attribute) monitors the current state of characterization at a given point in flow generation.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.51.1
+  version: 0.51.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -601,7 +601,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like