origen_testers 0.51.3 → 0.51.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3762e544f419c1c77e9f1d670c7203cd44e9ad6fef0246463f62c77e8592be92
-  data.tar.gz: 3c2e4679fae95dbb6f9976be317bbcf6c9fe3f8eff113d40fbdafe68cea06973
+  metadata.gz: a180bdac7bac206de7e54920fe663e70d1a2385d719a4a2ee134168856926142
+  data.tar.gz: 1882b6db742cdcb8f4a05a2a5f2d14c8bf0edcbee5e2ad65cff473a4a0ebefb7
 SHA512:
-  metadata.gz: 563af43372ac16a7159e4f1ca6d8aa8aed2fc630dc9224f477cb427332f76ec9ada304428caa15695cf48e7923fa3243154de71bc12b737e170d5370946a44f3
-  data.tar.gz: 2674ab9dda1e9b8e6a7816d5cab6add7eb9dc44b037ac2b12ef46a5d2473324632034faf88cf34998d501140eda7545a7ac19a8e0710ffb062c5523f93bdff49
+  metadata.gz: 1dc6ab272a3770ee8351f0b1fad2d17cc41fa1a0abf5fe3df4f0d7caba4aea82551fe2719dae4bb676c2080af4c0327e12d2682afd288db50f5f9bbad44a392e
+  data.tar.gz: 1be16fa7b79f24afeb21d59713c66134917922d19a4534e611bc9a153cdf10911e3a96c9a066928a30db3850ee26084dd9655065d388f5bcdf9102f00cef778c

data/config/version.rb

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

data/lib/origen_testers/decompiler/nodes.rb

@@ -103,7 +103,7 @@ module OrigenTesters
         alias_method :pinlist, :pins
 
         def initialize(pins:, context:)
-          @pins = pins.map(&:to_sym)
+          @pins = pins.map(&:strip).map(&:to_sym)
           super(context: context, type: :pinlist)
         end
       end

data/lib/origen_testers/igxl_based_tester/decompiler/atp.rb

@@ -33,6 +33,8 @@ module OrigenTesters
               imports[val.gsub(';', '')] = type
             elsif l.strip.empty?
               # Just whitespace. Ignore this, but don't throw an error
+            elsif !(l =~ Regexp.new(/vector/)).nil?
+              # line break between vector keyword and pinlist, ignore
             else
               Origen.app!.fail!("Unable to parse pattern frontmatter, at line: #{i}")
             end

data/lib/origen_testers/igxl_based_tester/decompiler.rb

@@ -19,7 +19,7 @@ module OrigenTesters
 
       @platform = 'j750'
       @splitter_config = {
-        pinlist_start:              /^vector/,
+        pinlist_start:              /\$tset/,
         vectors_start:              /^{/,
         vectors_end:                /^}/,
         vectors_include_start_line: false,

data/lib/origen_testers/stil_based_tester/base.rb

@@ -15,6 +15,7 @@ module OrigenTesters
         @min_repeat_loop = 2
         @pat_extension = 'stil'
         @compress = true
+        @use_timing_equations = options[:use_timing_equations]
 
         # @support_repeat_previous = true
         @match_entries = 10
@@ -30,6 +31,32 @@ module OrigenTesters
         true
       end
 
+      # returns the orderd pins with groups decomposed into individual pins
+      def flattened_ordered_pins
+        if @flattened_ordered_pins.nil?
+          @flattened_ordered_pins = []
+          ordered_pins.each do |p|
+            if p.is_a?(Origen::Pins::PinCollection)
+              p.each { |ip| @flattened_ordered_pins << ip }
+            else
+              @flattened_ordered_pins << p
+            end
+          end
+        end
+        @flattened_ordered_pins
+      end
+
+      def output_group_definition(grp, grp_name)
+        line = "\"#{grp_name}\" = '"
+        grp.each_with_index do |pin, i|
+          unless i == 0
+            line << '+'
+          end
+          line << pin.name.to_s
+        end
+        microcode "  #{line}';"
+      end
+
       # An internal method called by Origen to create the pattern header
       def pattern_header(options = {})
         options = {
@@ -42,7 +69,7 @@ module OrigenTesters
 
           microcode ''
           microcode 'Signals {'
-          ordered_pins.each do |pin|
+          flattened_ordered_pins.each do |pin|
             line = ''
             line << "#{pin.name} "
             if pin.direction == :input
@@ -58,22 +85,38 @@ module OrigenTesters
 
           microcode ''
           microcode 'SignalGroups {'
-          line = "\"#{ordered_pins_name || 'ALL'}\" = '"
-          ordered_pins.each_with_index do |pin, i|
-            unless i == 0
-              line << '+'
-            end
-            line << pin.name.to_s
+          # output pin group definitions used in this pattern
+          ordered_pins.each do |p|
+            output_group_definition(p, p.name.to_s) if p.is_a?(Origen::Pins::PinCollection)
           end
-          microcode "  #{line}';"
+
+          # output the all pin group
+          output_group_definition(flattened_ordered_pins, "#{ordered_pins_name || 'ALL'}")
           microcode '}'
 
+          # output the period category specs
+          if @use_timing_equations
+            microcode ''
+            microcode 'Spec {'
+            microcode "  Category c_#{@pattern_name} {"
+            (@wavesets || []).each_with_index do |w, i|
+              microcode "    period_#{w[:name]} = '#{w[:period]}ns';"
+            end
+            microcode '  }'
+            microcode '}'
+          end
+
           microcode ''
           microcode "Timing t_#{@pattern_name} {"
           (@wavesets || []).each_with_index do |w, i|
             microcode '' if i != 0
             microcode "  WaveformTable Waveset#{i + 1} {"
-            microcode "    Period '#{w[:period]}ns';"
+            period_var = "period_#{w[:name]}"
+            if @use_timing_equations
+              microcode "    Period '#{period_var}';"
+            else
+              microcode "    Period '#{w[:period]}ns';"
+            end
             microcode '    Waveforms {'
             w[:lines].each do |line|
               microcode "      #{line}"
@@ -90,6 +133,7 @@ module OrigenTesters
 
           microcode ''
           microcode "PatternExec e_#{@pattern_name} {"
+          microcode "  Category c_#{@pattern_name};" if @use_timing_equations
           microcode "  Timing t_#{@pattern_name};"
           microcode "  PatternBurst b_#{@pattern_name};"
           microcode '}'
@@ -106,6 +150,27 @@ module OrigenTesters
       end
 
       def set_timeset(t, period_in_ns = nil)
+        # check for period size override from the app if performing convert command
+        if Origen.current_command == 'convert'
+          listeners = Origen.listeners_for(:convert_command_set_period_in_ns)
+          if listeners.empty?
+            unless @call_back_message_displayed
+              Origen.log.warn 'STIL output is generated using "origen convert" with no timeset period callback method defined. Default period size will be used.'
+              Origen.log.info 'stil tester implements a callback for setting the timeset period size when converting a pattern to stil format'
+              Origen.log.info 'to use the callback feature add the following define to your app in config/application.rb'
+              Origen.log.info '  def convert_command_set_period_in_ns(timeset_name)'
+              Origen.log.info '    return 25 if timeset_name == "timeset0"'
+              Origen.log.info '    return 30 if timeset_name == "timeset1"'
+              Origen.log.info '    40'
+              Origen.log.info '  end'
+              @call_back_message_displayed = true
+            end
+          else
+            listeners.each do |listener|
+              period_in_ns = listener.convert_command_set_period_in_ns(t)
+            end
+          end
+        end
         super
         if pattern_only
           # Why does D10 not include this?
@@ -115,25 +180,32 @@ module OrigenTesters
           wave_number = nil
           @wavesets.each_with_index do |w, i|
             if w[:name] == timeset.name && w[:period] = timeset.period_in_ns
-              wave_number = i
+              wave_number = i + 1               # bug fix wave numbers are 1 more than their index #
             end
           end
           unless wave_number
             lines = []
-            ordered_pins.each do |pin|
+            period_var = "period_#{timeset.name}"
+            flattened_ordered_pins.each do |pin|
               if pin.direction == :input || pin.direction == :io
                 line = "#{pin.name} { 01 { "
                 wave = pin.drive_wave if tester.timeset.dut_timeset
-                (wave ? wave.evaluated_events : []).each do |t, v|
-                  line << "'#{t}ns' "
-                  if v == 0
-                    line << 'D'
-                  elsif v == 0
-                    line << 'U'
-                  else
-                    line << 'D/U'
+                if wave
+                  (@use_timing_equations ? wave.events : wave.evaluated_events).each do |t, v|
+                    if @use_timing_equations
+                      line << "'#{t.to_s.gsub('period', period_var)}' "
+                    else
+                      line << "'#{t}ns' "
+                    end
+                    if v == 0
+                      line << 'D'
+                    elsif v == 1
+                      line << 'U'
+                    else
+                      line << 'D/U'
+                    end
+                    line << '; '
                   end
-                  line << '; '
                 end
                 line << '}}'
                 lines << line
@@ -141,20 +213,26 @@ module OrigenTesters
               if pin.direction == :output || pin.direction == :io
                 line = "#{pin.name} { LHX { "
                 wave = pin.compare_wave if tester.timeset.dut_timeset
-                (wave ? wave.evaluated_events : []).each_with_index do |tv, i|
-                  t, v = *tv
-                  if i == 0 && t != 0
-                    line << "'0ns' X; "
-                  end
-                  line << "'#{t}ns' "
-                  if v == 0
-                    line << 'L'
-                  elsif v == 0
-                    line << 'H'
-                  else
-                    line << 'L/H/X'
+                if wave
+                  (@use_timing_equations ? wave.events : wave.evaluated_events).each_with_index do |tv, i|
+                    t, v = *tv
+                    if i == 0 && t != 0
+                      line << "'0ns' X; "
+                    end
+                    if @use_timing_equations
+                      line << "'#{t.to_s.gsub('period', period_var)}' "
+                    else
+                      line << "'#{t}ns' "
+                    end
+                    if v == 0
+                      line << 'L'
+                    elsif v == 0
+                      line << 'H'
+                    else
+                      line << 'L/H/X'
+                    end
+                    line << '; '
                   end
-                  line << '; '
                 end
                 line << '}}'
                 lines << line

data/templates/origen_guides/pattern/stil.md.erb

@@ -17,6 +17,23 @@ If the timeset waveforms used by the pattern are
 [fully defined within your Origen application](<%= path "guides/pattern/timing/#Defining_Timesets" %>)
 then that information will also be represented within the generated STIL pattern.
 
+Optionally the defined timing can be represented in equation form by setting up your environment as follows:
+
+~~~ruby
+OrigenTesters::STIL.new use_timing_equations: true
+~~~
+
+If your application is used to convert patterns from another format into STIL format you can add
+ a callback function to config/application.rb to set appropriate period sizes as follows:
+ 
+~~~ruby
+def convert_command_set_period_in_ns(timeset_name)
+  return 25 if timeset_name == "timeset0"
+  return 30 if timeset_name == "timeset1"
+  40
+end
+~~~
+
 A pattern containing a `Pattern { }` block only - i.e. only vectors and without the `Signals { }`, 
 `Timing { }` and other frontmatter blocks - can be generated by setting up your environment as follows:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.51.3
+  version: 0.51.5
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2024-04-11 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.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like