origen_testers 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706814107f22131efb6ebf0c670169ce8bbcdfbc
-  data.tar.gz: e6ccc22c67fd1473978afa030a6b092e2b41f26f
+  metadata.gz: 9a7d6f5f17bb69b966e7c3b833e91a8b593e226d
+  data.tar.gz: 54c251cd6238267287e6921dbe5dc32b27c56db0
 SHA512:
-  metadata.gz: 353998902cd8c9477e5c053a0c248c7824e3cc3b942c49107e3f3b26865daea3489979fe1fe49f9a90d3621e4af8ffadfef5b8dae8caea4e9af9b5f097cc6675
-  data.tar.gz: 1e05c58fe84a8e81ee6d35fb68043d7278e6fdf37fb5819a6065e8319fa7b26b165cb3f6103ff63c4ebb551e80cd74aaef17ac01a208f889fd956ceb083aa5a7
+  metadata.gz: eca1251500248c27679ccd44b438168f1e15a5c84e9f2165532490d8656945ac3c1637452df6cc2a1bbd6d7063b35c5e9e27ca577d2ea270064be5f44f1b6e94
+  data.tar.gz: 27388317149cb3eb64f4e4d998442b9076816a488f5d13c9954a74593efd7993c0b718a7bd6eaeeca1a3db65490f80feb105ac1230f4d61c2ebfc9966a8eb988

data/config/version.rb

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

data/lib/commands/run.rb

@@ -33,12 +33,16 @@ unless program
   exit 1
 end
 
-flow = ARGV.first
-
-unless flow
-  puts 'You must supply the name of the flow to execute, the current program has these flows'
-  puts OrigenTesters.program.flows.keys
-  exit 1
+unless ARGV.first
+  if OrigenTesters.program.flows.keys.size == 1
+    ARGV << OrigenTesters.program.flows.keys.first
+  else
+    puts 'You must supply the name of the flow to execute, the current program has these flows'
+    puts OrigenTesters.program.flows.keys
+    exit 1
+  end
 end
 
-OrigenTesters.program.flows[flow.to_sym].run(options)
+ARGV.each do |flow|
+  OrigenTesters.program.flows[flow.to_sym].run(options)
+end

data/lib/origen_testers/api.rb

@@ -60,6 +60,11 @@ module OrigenTesters
       !is_vector_based?
     end
 
+    def stil?
+      defined?(OrigenTesters::StilBasedTester::Base) &&
+        is_a?(OrigenTesters::StilBasedTester::Base)
+    end
+
     def j750?
       is_a?(OrigenTesters::IGXLBasedTester::J750)
     end

data/lib/origen_testers/interface.rb

@@ -51,6 +51,30 @@ module OrigenTesters
       OrigenTesters::Interface.write?
     end
 
+    # Set to :enabled to have the current flow wrapped by an enable flow variable
+    # that is enabled by default (top-level flow has to disable modules it doesn't want).
+    #
+    # Set to :disabled to have the opposite, where the top-level flow has to enable all
+    # modules.
+    #
+    # Set to nil to have no wrapping. While this is the default, setting this to nil will
+    # override any setting of the attribute of the same name that has been set at
+    # tester-level by the target.
+    def add_flow_enable=(value)
+      return unless flow.respond_to?(:add_flow_enable=)
+      if value
+        if value == :enable || value == :enabled
+          flow.add_flow_enable = :enabled
+        elsif value == :disable || value == :disabled
+          flow.add_flow_enable = :disabled
+        else
+          fail "Unknown add_flow_enable value, #{value}, must be :enabled or :disabled"
+        end
+      else
+        flow.add_flow_enable = nil
+      end
+    end
+
     # This identifier will be used to make labels and other references unique to the
     # current application. This will help to avoid name duplication if a program is
     # comprised of many modules generated by Origen.

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

@@ -9,6 +9,8 @@ module OrigenTesters
         # Returns an array containing all runtime variables which get set by the flow
         attr_reader :set_runtime_variables
 
+        attr_accessor :add_flow_enable
+
         def var_filename
           @var_filename || 'global'
         end
@@ -39,11 +41,48 @@ module OrigenTesters
         def at_flow_end
         end
 
+        def flow_header
+          h = ['{']
+          if add_flow_enable
+            var = filename.sub(/\..*/, '').upcase
+            var = "#{var}_ENABLE"
+            if add_flow_enable == :enabled
+              flow_control_variables << [var, 1]
+            else
+              flow_control_variables << [var, 0]
+            end
+            h << "  if @#{var} == 1 then"
+            h << '  {'
+            i = '  '
+          else
+            i = ''
+          end
+
+          h << i + '  {'
+          set_runtime_variables.each do |var|
+            h << i + "    @#{var.to_s.upcase} = -1;"
+          end
+          h << i + '  }, open,"Init Flow Control Vars", ""'
+          h
+        end
+
+        def flow_footer
+          f = []
+          if add_flow_enable
+            f << '  }'
+            f << '  else'
+            f << '  {'
+            f << '  }'
+          end
+          f << "}, open,\"#{filename.sub(/\..*/, '').upcase}\", \"\""
+          f
+        end
+
         def finalize(options = {})
           super
           test_suites.finalize
           test_methods.finalize
-          @indent = 0
+          @indent = add_flow_enable ? 2 : 1
           @lines = []
           @stack = { on_fail: [], on_pass: [] }
           m = Processors::IfRanCleaner.new.process(model.ast)
@@ -54,7 +93,7 @@ module OrigenTesters
         end
 
         def line(str)
-          @lines << (' ' * @indent * 2) + str
+          @lines << ('  ' * @indent) + str
         end
 
         # def on_flow(node)

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

@@ -27,6 +27,9 @@ module OrigenTesters
         # @api private
         def at_flow_start
           flow.at_flow_start
+          # Initialize this to the value currently set on the tester, any further setting of
+          # this by the interface will override
+          flow.add_flow_enable = tester.add_flow_enable
           @pattern_master_filename = nil
         end
 

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

@@ -18,8 +18,11 @@ module OrigenTesters
         end
 
         def clean_flow_control_variables
-          # These map to user flags and can only be integers
-          flow_control_variables.uniq.sort
+          flow_control_variables.uniq.sort do |x, y|
+            x = x[0] if x.is_a?(Array)
+            y = y[0] if y.is_a?(Array)
+            x <=> y
+          end
         end
 
         def clean_runtime_control_variables

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -6,10 +6,16 @@ module OrigenTesters
       # Disable inline (end of vector) comments, enabled by default
       attr_accessor :inline_comments
 
-      # Returns a new J750 instance, normally there would only ever be one of these
-      # assigned to the global variable such as $tester by your target:
-      #   $tester = J750.new
-      def initialize
+      # Returns whether the tester has been configured to wrap top-level flow modules with an
+      # enable or not.
+      #
+      # Returns nil if not.
+      #
+      # Returns :enabled if the enable is configured to be on by default, or :disabled if it is
+      # configured to be off by default.
+      attr_reader :add_flow_enable
+
+      def initialize(options = {})
         @max_repeat_loop = 65_535
         @min_repeat_loop = 33
         @pat_extension = 'avc'
@@ -20,6 +26,26 @@ module OrigenTesters
         @comment_char = '#'
         @level_period = true
         @inline_comments = true
+        if options[:add_flow_enable]
+          self.add_flow_enable = options[:add_flow_enable]
+        end
+      end
+
+      # Set to :enabled to have all top-level flow modules wrapped by an enable flow variable
+      # that is enabled by default (top-level flow has to disable modules it doesn't want).
+      #
+      # Set to :disabled to have the opposite, where the top-level flow has to enable all
+      # modules.
+      #
+      # Note that the interface can override this setting for each flow during program generation.
+      def add_flow_enable=(value)
+        if value == :enable || value == :enabled
+          @add_flow_enable = :enabled
+        elsif value == :disable || value == :disabled
+          @add_flow_enable = :disabled
+        else
+          fail "Unknown add_flow_enable value, #{value}, must be :enabled or :disabled"
+        end
       end
 
       # Capture the pin data from a vector to the tester.

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

@@ -175,16 +175,15 @@ test_flow
 <%= line %>
 %   end
 % else
-{
-  {
-%   set_runtime_variables.each do |var|
-    @<%= var.to_s.upcase %> = -1;
+%   flow_header.each do |line|
+<%= line %>
 %   end
-  }, open,"Init Flow Control Vars", ""
 %   lines.each do |line|
-  <%= line %>
+<%= line %>
+%   end
+%   flow_footer.each do |line|
+<%= line %>
 %   end
-}, open,"<%= filename.sub(/\..*/, '').upcase %>", ""
 % end
 end
 -------------------------------------------------

data/program/prb2.rb

@@ -2,6 +2,9 @@
 # a single source file
 Flow.create interface: 'OrigenTesters::Test::Interface' do
 
+  # Test that this can be overridden from the target at flow-level
+  self.add_flow_enable = :enabled
+
   self.resources_filename = 'prb2'
 
   func :erase_all, :duration => :dynamic

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -343,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like