origen_testers 0.48.3 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c67bc8fcc8e5ee79fccb2b53ab691ce22f5635811bedcb2cc6cbd6a247d0af7
-  data.tar.gz: 94966a015d097731c5a8320bbe2f0f8d7238b988151af466b213c2017e3f1c53
+  metadata.gz: d674d200f01a3d1d9b7c6162ecf527fa91c4466f5d59a5d6f5e0e33b4cd1a2d8
+  data.tar.gz: fcfe7c097dc04374a29521dcc476e55b4aada56bbac7c060f677eed4c5c87748
 SHA512:
-  metadata.gz: 4628a25c96b619ddc665fc49c958468f9192ea16af3609d04cbb40f27ef714e13ccfba33a111b632e1842f7fb70018eb6665a70f57bfcdc316e829bd1cd1560c
-  data.tar.gz: 7fa99d5a51d669bb845bc529d91dcf69a77c19851313b1cacfca0e1d704f122c23dda8f7495de9893af6ab89103ea2e2648eaa5561cad96ddf2269fdc8f73a4f
+  metadata.gz: 3342964cf9787fd99bf25003963a3ff02182e325ac256161bc32eae15759f666bb7d3003ed82e63fd8e441a87b5c04bfc88d89ca54945672b9ba921adc71be02
+  data.tar.gz: 3ed6932df2fcf98baba22cbf5ddf0f50284442b501d3f4ac0df269e4acdc7b1dcf6dc2d12f77441ae1b1fa1254ff797ac3434cbda35e15dfa7ccff65c820dc1d

data/config/version.rb

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

data/lib/origen_testers/atp/flow.rb

@@ -439,6 +439,8 @@ module OrigenTesters::ATP
             children << on_pass(options[:on_pass]) if options[:on_pass]
           end
 
+          children << priority(options[:priority]) if options[:priority]
+
           save_conditions
           n(:test, children)
         end
@@ -810,6 +812,10 @@ module OrigenTesters::ATP
       n1(:id, name)
     end
 
+    def priority(name)
+      n1(:priority, name)
+    end
+
     def on_fail(options = {})
       if options.is_a?(Proc)
         node = n0(:on_fail)

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -115,6 +115,7 @@ module OrigenTesters
         @overlay_style = :subroutine	# default to use subroutine for overlay
         @capture_style = :hram			# default to use hram for capture
         @overlay_subr = nil
+        @overlay_history = {} # used to track labels, subroutines, digsrc pins used etc
 
         if options[:add_flow_enable]
           self.add_flow_enable = options[:add_flow_enable]
@@ -203,6 +204,12 @@ module OrigenTesters
             when :subroutine, :default
               subroutine_overlay(overlay_str, options)
               ovly_style = :subroutine
+            when :label, :global_label
+              options[:dont_compress] = true
+              unless @overlay_history.key?(overlay_str)
+                cc "#{overlay_str}"
+                @overlay_history[overlay_str] = { is_label: true }
+              end
             when :handshake
               if @delayed_handshake
                 if @delayed_handshake != overlay_str

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

@@ -119,6 +119,7 @@ module OrigenTesters
           o[:test_name] = extract_test_name(node, o)
           o[:test_number] = extract_test_number(node, o)
           o[:limits] = extract_limits(node, o)
+          o[:priority] = extract_priority(node, o)
           o[:test_text] = node.find(:test_text).try(:value)
           if on_fail = node.find(:on_fail)
             if set_result = on_fail.find(:set_result)
@@ -141,7 +142,7 @@ module OrigenTesters
             end
             if smt8?
               if o[:bin_s_num]
-                limits_workbook.add_softbin o[:bin_s_num], name: o[:bin_s_name], bin: o[:bin_h_num]
+                limits_workbook.add_softbin o[:bin_s_num], name: o[:bin_s_name], bin: o[:bin_h_num], priority: o[:priority]
               end
               if o[:bin_h_num]
                 limits_workbook.add_bin o[:bin_h_num], name: o[:bin_h_name]
@@ -217,6 +218,16 @@ module OrigenTesters
           name
         end
 
+        def extract_priority(node, o)
+          test_obj = node.find(:priority).to_a[0]
+          if test_obj.is_a?(Hash)
+            priority = test_obj['Priority']
+          else
+            priority = test_obj.respond_to?(:priority) ? test_obj.priority : test_obj if test_obj
+          end
+          priority
+        end
+
         def extract_test_name(node, o)
           test_obj = node.find(:object).to_a[0]
           if smt8?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.48.3
+  version: 0.49.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.57.1
+- !ruby/object:Gem::Dependency
+  name: dentaku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -544,7 +558,6 @@ files:
 - templates/origen_guides/pattern/stil.md.erb
 - templates/origen_guides/pattern/timing.md.erb
 - templates/origen_guides/pattern/ultraflex.md.erb
-- templates/origen_guides/pattern/ultraflex.md.erb~
 - templates/origen_guides/pattern/v93k.md.erb
 - templates/origen_guides/program/charz.md.erb
 - templates/origen_guides/program/code.md.erb

data/templates/origen_guides/pattern/ultraflex.md.erb~

@@ -1,30 +0,0 @@
-% render "layouts/guides.html" do
-
-This page will be used to document any UltraFLEX-only APIs related to pattern generation,
-however the goal is to have as few of these as possible so that Origen pattern source code can re-target
-automatically to any supported platform.
-
-There are no significant APIs in this category currently, therefore refer to the
-[Common Pattern API](<%= path "guides/pattern/common" %>) which can fully target the UltraFLEX.
-
-### DigSrc
-
-UltraFlex supports <code>:digsrc</code> as a <code>tester.overlay_style</code> set like this:
-
-~~~ruby
-  tester.overlay_style = :digsrc
-~~~
-
-By default Origen will automatically place the digsrc start opcode at the beginning of the resulting pattern
-when overlay is used. In some cases (like when the pattern is used in a pattern set that has already started
-the instrument in a previous pattern, or possibly in svm_patterns) this behavior is undesirable.
-
-The insertion of this start opcode can be disabled by placing the following code **before** any overlay operations
-for a given pin.
-
-~~~ruby
-  tester.digsrc_skip_start :pin_or_group_name if tester.ultraflex?
-  # Overlay operations can happen after this point
-~~~
-
-% end