origen_stil 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72b98b73cdeeca00b3fdf509c61faed891f84bc26e0e8eac2e35819cb19fefa
-  data.tar.gz: 79ae1508faa458453fc5f537f0b8a666e07cadb21a6a8af62caab1a375a77934
+  metadata.gz: 259036f2835904086a3ee116686b8deea693701480214760345f255b7f5a8b11
+  data.tar.gz: d7eb35222e5ac396c59f03274464321c71f82487ba0f334d8d65db471cbda997
 SHA512:
-  metadata.gz: 9c14bd4cd23e893324f202256eef34b2bd4eed81f2ca28167905fbbbe124f36f90392bb828f6ec07be94698025519570f2e33c7e7626a01f00d0489bc2e4995a
-  data.tar.gz: c2dd4d2176e1a10480a2f19a45fc922a7ff61c0e9077a83e825569852021fab91e9088d3236719643060f42f32853523184fd32cc00a93addef808c7dfdd52a4
+  metadata.gz: c04ff6b66af25e716fbd228266d1ccad13ebd921ab01490fedb4126db563b4787c39d973f6b547898ae6f8ce709c7131482b2fa4ad0d4dde1c73900d96b0cb1f
+  data.tar.gz: 30e9d17e1cae9969b10b63edb997587ae31fa41a8f3c3fd1e6229f0079a9a61da38061f79748516dbea2587b6a3964417b2fe41460d72a41374db6883bdb6ed2

data/config/commands.rb

@@ -33,42 +33,39 @@ when "tags"
   # control flowing back to Origen
   exit 0
 
-## Example of how to make a command to run unit tests, this simply invokes RSpec on
-## the spec directory
-#when "specs"
-#  require "rspec"
-#  exit RSpec::Core::Runner.run(['spec'])
+# Example of how to make a command to run unit tests, this simply invokes RSpec on
+# the spec directory
+when "specs"
+  require "rspec"
+  exit RSpec::Core::Runner.run(['spec'])
 
-## Example of how to make a command to run diff-based tests
-#when "examples", "test"
-#  Origen.load_application
-#  status = 0
-#
-#  # Compiler tests
-#  ARGV = %w(templates/example.txt.erb -t debug -r approved)
-#  load "origen/commands/compile.rb"
-#  # Pattern generator tests
-#  #ARGV = %w(some_pattern -t debug -r approved)
-#  #load "#{Origen.top}/lib/origen/commands/generate.rb"
-#
-#  if Origen.app.stats.changed_files == 0 &&
-#     Origen.app.stats.new_files == 0 &&
-#     Origen.app.stats.changed_patterns == 0 &&
-#     Origen.app.stats.new_patterns == 0
-#
-#    Origen.app.stats.report_pass
-#  else
-#    Origen.app.stats.report_fail
-#    status = 1
-#  end
-#  puts
-#  if @command == "test"
-#    Origen.app.unload_target!
-#    require "rspec"
-#    result = RSpec::Core::Runner.run(['spec'])
-#    status = status == 1 ? 1 : result
-#  end
-#  exit status  # Exit with a 1 on the event of a failure per std unix result codes
+# Example of how to make a command to run diff-based tests
+when "examples", "test"
+  Origen.load_application
+  status = 0
+
+  # Pattern generator tests
+  ARGV = %w(example3 -r approved -e v93k)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  if Origen.app.stats.changed_files == 0 &&
+     Origen.app.stats.new_files == 0 &&
+     Origen.app.stats.changed_patterns == 0 &&
+     Origen.app.stats.new_patterns == 0
+
+    Origen.app.stats.report_pass
+  else
+    Origen.app.stats.report_fail
+    status = 1
+  end
+  puts
+  if @command == "test"
+    Origen.app.unload_target!
+    require "rspec"
+    result = RSpec::Core::Runner.run(['spec'])
+    status = status == 1 ? 1 : result
+  end
+  exit status  # Exit with a 1 on the event of a failure per std unix result codes
 
 # Always leave an else clause to allow control to fall back through to the
 # Origen command handler.
@@ -79,8 +76,8 @@ else
   @application_commands = <<-EOT
  tags         Build a tags file for this app
  build        Build/compile the latest grammar file(s)
+ specs        Run the specs (tests), -c will enable coverage
+ examples     Run the examples (tests), -c will enable coverage
+ test         Run both specs and examples, -c will enable coverage
   EOT
-# specs        Run the specs (tests), -c will enable coverage
-# examples     Run the examples (tests), -c will enable coverage
-# test         Run both specs and examples, -c will enable coverage
 end 

data/config/version.rb

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

data/grammars/stil.rb

@@ -254,7 +254,7 @@ module OrigenSTIL
           elements[1]
         end
 
-        def sigref_expression
+        def expression_subset
           elements[2]
         end
 
@@ -311,7 +311,7 @@ module OrigenSTIL
             r5 = _nt_s
             s3 << r5
             if r5
-              r6 = _nt_sigref_expression
+              r6 = _nt_expression_subset
               s3 << r6
               if r6
                 r7 = _nt_s
@@ -352,153 +352,104 @@ module OrigenSTIL
         r0
       end
 
-      def _nt_expression
+      def _nt_expression_subset
         start_index = index
-        if node_cache[:expression].has_key?(index)
-          cached = node_cache[:expression][index]
+        if node_cache[:expression_subset].has_key?(index)
+          cached = node_cache[:expression_subset][index]
           if cached
-            node_cache[:expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:expression_subset][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0 = index
-        r1 = _nt_sigref_expression
+        r1 = _nt_add
         if r1
           r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
-          r2 = _nt_time_expression
+          r2 = _nt_subtract
           if r2
             r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
             r0 = r2
           else
-            @index = i0
-            r0 = nil
-          end
-        end
-
-        node_cache[:expression][start_index] = r0
-
-        r0
-      end
-
-      def _nt_sigref_expression
-        start_index = index
-        if node_cache[:sigref_expression].has_key?(index)
-          cached = node_cache[:sigref_expression][index]
-          if cached
-            node_cache[:sigref_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        s0, i0 = [], index
-        loop do
-          i1 = index
-          r2 = _nt_add
-          if r2
-            r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-            r1 = r2
-          else
-            r3 = _nt_subtract
+            r3 = _nt_name
             if r3
               r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
-              r1 = r3
+              r0 = r3
             else
-              r4 = _nt_name
+              r4 = _nt_paren_expression
               if r4
                 r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
-                r1 = r4
+                r0 = r4
               else
-                r5 = _nt_paren_expression
-                if r5
-                  r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
-                  r1 = r5
-                else
-                  @index = i1
-                  r1 = nil
-                end
+                @index = i0
+                r0 = nil
               end
             end
           end
-          if r1
-            s0 << r1
-          else
-            break
-          end
-        end
-        if s0.empty?
-          @index = i0
-          r0 = nil
-        else
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         end
 
-        node_cache[:sigref_expression][start_index] = r0
+        node_cache[:expression_subset][start_index] = r0
 
         r0
       end
 
-      def _nt_time_expression
+      def _nt_expression
         start_index = index
-        if node_cache[:time_expression].has_key?(index)
-          cached = node_cache[:time_expression][index]
+        if node_cache[:expression].has_key?(index)
+          cached = node_cache[:expression][index]
           if cached
-            node_cache[:time_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
-        s0, i0 = [], index
-        loop do
-          i1 = index
-          r2 = _nt_add
+        i0 = index
+        r1 = _nt_add
+        if r1
+          r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+          r0 = r1
+        else
+          r2 = _nt_subtract
           if r2
             r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-            r1 = r2
+            r0 = r2
           else
-            r3 = _nt_subtract
+            r3 = _nt_multiply
             if r3
               r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
-              r1 = r3
+              r0 = r3
             else
-              r4 = _nt_multiply
+              r4 = _nt_divide
               if r4
                 r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
-                r1 = r4
+                r0 = r4
               else
-                r5 = _nt_divide
+                r5 = _nt_number_with_unit
                 if r5
                   r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
-                  r1 = r5
+                  r0 = r5
                 else
-                  r6 = _nt_number_with_unit
+                  r6 = _nt_number
                   if r6
                     r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
-                    r1 = r6
+                    r0 = r6
                   else
-                    r7 = _nt_number
+                    r7 = _nt_name
                     if r7
                       r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
-                      r1 = r7
+                      r0 = r7
                     else
-                      r8 = _nt_name
+                      r8 = _nt_paren_expression
                       if r8
                         r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
-                        r1 = r8
+                        r0 = r8
                       else
-                        r9 = _nt_paren_expression
-                        if r9
-                          r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
-                          r1 = r9
-                        else
-                          @index = i1
-                          r1 = nil
-                        end
+                        @index = i0
+                        r0 = nil
                       end
                     end
                   end
@@ -506,20 +457,9 @@ module OrigenSTIL
               end
             end
           end
-          if r1
-            s0 << r1
-          else
-            break
-          end
-        end
-        if s0.empty?
-          @index = i0
-          r0 = nil
-        else
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         end
 
-        node_cache[:time_expression][start_index] = r0
+        node_cache[:expression][start_index] = r0
 
         r0
       end
@@ -946,7 +886,7 @@ module OrigenSTIL
           elements[1]
         end
 
-        def time_expression
+        def expression
           elements[2]
         end
 
@@ -986,7 +926,7 @@ module OrigenSTIL
           r2 = _nt_s
           s0 << r2
           if r2
-            r3 = _nt_time_expression
+            r3 = _nt_expression
             s0 << r3
             if r3
               r4 = _nt_s
@@ -7954,7 +7894,7 @@ module OrigenSTIL
 
       module Name2
         def to_ast
-          text_value
+          n :name, text_value
         end
       end
 
@@ -9032,6 +8972,16 @@ module OrigenSTIL
         end
       end
 
+      module Number3
+        def to_ast
+          if text_value.to_f == text_value.to_i
+            text_value.to_i
+          else
+            text_value.to_f
+          end
+        end
+      end
+
       def _nt_number
         start_index = index
         if node_cache[:number].has_key?(index)
@@ -9048,6 +8998,8 @@ module OrigenSTIL
         if r1
           r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
+          r0.extend(Number3)
+          r0.extend(Number3)
         else
           i2, s2 = index, []
           r3 = _nt_signed_integer
@@ -9076,6 +9028,8 @@ module OrigenSTIL
           if r2
             r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
             r0 = r2
+            r0.extend(Number3)
+            r0.extend(Number3)
           else
             i6, s6 = index, []
             r7 = _nt_signed_integer
@@ -9104,6 +9058,8 @@ module OrigenSTIL
             if r6
               r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
               r0 = r6
+              r0.extend(Number3)
+              r0.extend(Number3)
             else
               i10, s10 = index, []
               r11 = _nt_signed_integer
@@ -9146,6 +9102,8 @@ module OrigenSTIL
               if r10
                 r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
                 r0 = r10
+                r0.extend(Number3)
+                r0.extend(Number3)
               else
                 @index = i0
                 r0 = nil

data/lib/origen_stil.rb

@@ -22,11 +22,12 @@ module OrigenSTIL
   end
 
   module Processor
-    autoload :Base,      'origen_stil/processor/base'
-    autoload :Pins,      'origen_stil/processor/pins'
-    autoload :PinGroups, 'origen_stil/processor/pin_groups'
-    autoload :Pattern,   'origen_stil/processor/pattern'
-    autoload :Timesets,  'origen_stil/processor/timesets'
+    autoload :Base,       'origen_stil/processor/base'
+    autoload :Pins,       'origen_stil/processor/pins'
+    autoload :PinGroups,  'origen_stil/processor/pin_groups'
+    autoload :Pattern,    'origen_stil/processor/pattern'
+    autoload :Timesets,   'origen_stil/processor/timesets'
+    autoload :Expression, 'origen_stil/processor/expression'
   end
 
   autoload :Pattern, 'origen_stil/pattern'
@@ -63,6 +64,11 @@ module OrigenSTIL
   def self.patterns
     @patterns ||= {}
   end
+
+  # @api private
+  def self.unquote(str)
+    str.gsub(/\A("|')|("|')\Z/, '')
+  end
 end
 
 STIL = OrigenSTIL unless defined?(STIL)

data/lib/origen_stil/pattern.rb

@@ -8,23 +8,31 @@ module OrigenSTIL
         fail "STIL source file not found: #{path}"
       end
       @path = path
+      @loop = Struct.new(:id, :count, :status, :source_line_number, :number_of_lines, :braces, :lines)
+      @n = 0
     end
 
     def execute(options = {})
-      timeset = nil
+      options = {
+        set_timesets: false,
+        add_pins:     true
+      }.merge(options)
+      @exec_options = options
+      @n = 0
+      add_pins if options[:add_pins]
       Processor::Pattern.new.run(ast) do |pattern_name|
-        each_vector(pattern_name, options) do |vector|
-          if options[:set_timesets] && vector[:timeset] && vector[:timeset] != timeset
-            tester.set_timeset(vector[:timeset], timesets[vector[:timeset]][:period] || 0)
-            timeset = vector[:timeset]
-          end
-          vector[:comments].each { |comment| cc comment }
-          vector[:pindata].each do |pin, data|
-            pin = dut.pins(pin)
-            data = data.gsub(/\s+/, '')
-            pin.vector_formatted_value = data
+        i = 0
+        open = false
+        File.foreach(path) do |line|
+          if open
+            # Stop at next pattern or EOF
+            break if line =~ /^\s*Pattern/
+
+            consume_line(line, i)
+          else
+            open = true if line =~ /^\s*Pattern "?'?#{pattern_name}"?'?\s*{/
           end
-          vector[:repeat].cycles
+          i += 1
         end
       end
     end
@@ -69,53 +77,128 @@ module OrigenSTIL
       @timesets ||= Processor::Timesets.new.run(ast, options)
     end
 
-    # Yields each vector in the given pattern to the caller as a Hash with the
-    # structure shown in these examples:
-    #
-    #     { timeset: "wave1",
-    #       comments: ["blah, blah", "blah blah blah"],
-    #       pindata: { "ALL" => "10011011101" },
-    #       repeat: 1,
-    #     }
-    #
-    #     { timeset: nil,
-    #       comments: [],
-    #       pindata: { "portA" => "10011011101", "portB" => "10010" },
-    #       repeat: 1000
-    #     }
-    #
-    def each_vector(pattern_name, options = {})
-      open = false
-      vector = { timeset: nil, comments: [], pindata: {}, repeat: 1 }
-      File.foreach(path) do |line|
-        if open
-          # Stop at next pattern or EOF
-          break if line =~ /^\s*Pattern/
-          if line =~ /^\s*Ann\s*{\*\s*(.*)\s*\*}/
-            vector[:comments] << Regexp.last_match(1)
-          elsif line =~ /(?:^|.*:)\s*(?:W|WaveformTable)\s+(.*)\s*;/
-            vector[:timeset] = Regexp.last_match(1)
-          elsif line =~ /(?:^|.*:)\s*Loop\s+(\d+)(\s|{)/
-            vector[:repeat] = Regexp.last_match(1).to_i
-          elsif line =~ /(?:^|.*:)\s*(?:V|Vector)\s+{(.*)}/
-            Regexp.last_match(1).strip.split(';').each do |assignment|
-              assignment = assignment.split(/\s*=\s*/)
-              vector[:pindata][assignment[0]] = assignment[1]
+    private
+
+    #     vector[:repeat].cycles
+    def consume_line(line, source_line_number)
+      if @open_loop
+        execute_loop(line)
+      else
+        if line =~ /(.*)(?:^|.*:)\s*Loop\s+(\d+)(.*)/
+          #                           :id,                   :count,              :status, :source_line_number, :number_of_lines, :braces, :lines)
+          @open_loop = @loop.new(Regexp.last_match(1), Regexp.last_match(2).to_i, :pending, source_line_number,        0,             0,      [])
+          execute_loop(Regexp.last_match(3))
+
+        else
+          execute_line(line, source_line_number)
+        end
+      end
+    end
+
+    def execute_loop(line)
+      # This is the number of lines that the source code spans, not necessarily the number
+      # of active lines in the loop
+      @open_loop.number_of_lines += 1
+      content = ''
+      comment = nil
+      line.each_char do |c|
+        # Stop processing the remainder if the line when a comment is encountered
+        if c == '/'
+          break if comment == '/'
+          comment = '/'
+          next
+        else
+          comment = nil
+        end
+        if @open_loop.status == :pending
+          next if c == ' ' || c == "\t" || c == "\n"
+          if c == '{'
+            @open_loop.status = :open
+            @open_loop.braces += 1
+          else
+            fail "No start of loop character '{' around line #{@open_loop.source_line_number}"
+          end
+        elsif @open_loop.status == :open
+          if c == '{'
+            @open_loop.braces += 1
+            content += c
+          elsif c == '}'
+            @open_loop.braces -= 1
+            if @open_loop.braces == 0
+              @open_loop.status = :done
+              content = content.strip
+              unless content.empty?
+                @open_loop.lines << content
+                content = ''
+              end
+            else
+              content += c
             end
-            yield vector
-            vector = { timeset: nil, comments: [], pindata: {}, repeat: 1 }
+          else
+            content += c
           end
         else
-          open = true if line =~ /^\s*Pattern #{pattern_name}\s*{/
+          content += c
         end
       end
+
+      if @open_loop.status == :done
+        lp = @open_loop
+        @open_loop = nil
+        # If loop being used like a repeat
+        if lp.lines.size == 1 && lp.lines.first =~ /(?:^|.*:)\s*(?:V|Vector)\s+{(.*)}/
+          execute_line(lp.lines.first, lp.source_line_number, lp.count)
+        else
+          tester.loop_vectors "lp#{@n}", lp.count do
+            lp.lines.each { |line| consume_line(line, lp.source_line_number) }
+          end
+        end
+        # Consume any remaining content on the line after the loop closed
+        unless content.strip.empty?
+          consume_line(content, lp.source_line_number + lp.number_of_lines - 1)
+        end
+      else
+        content = content.strip
+        @open_loop.lines << content unless content.empty?
+      end
     end
 
-    def each_vector_with_index(pattern_name, options = {})
-      i = 0
-      each_vector(pattern_name, options) do |vec|
-        yield vec, i
-        i += 1
+    # Sends any understood operations from the given line to the current tester
+    def execute_line(line, source_line_number, cycles = 1)
+      # These are in order of more likely occurrence for speed, i.e. assume that most
+      # pattern lines are vectors...
+      if line =~ /(?:^|.*:)\s*(?:V|Vector)\s+{(.*)}/
+        Regexp.last_match(1).strip.split(';').each do |assignment|
+          assignment = assignment.split(/\s*=\s*/)
+          pin = dut.pins(OrigenSTIL.unquote(assignment[0]))
+          data = assignment[1].gsub(/\s+/, '')
+          pin.vector_formatted_value = data
+        end
+        cycles.cycles
+
+      # Pattern comments
+      elsif line =~ /^\s*Ann\s*{\*\s*(.*)\s*\*}/
+        cc Regexp.last_match(1)
+
+      # Source comments
+      elsif line =~ /\s*\/\/.*/
+      # Just ignore source comments
+
+      # Change of timeset
+      elsif line =~ /(?:^|.*:)\s*(?:W|WaveformTable)\s+(.*)\s*;/
+        if @exec_options[:set_timesets]
+          timeset = OrigenSTIL.unquote(Regexp.last_match(1))
+          if timeset != @current_timeset
+            tester.set_timeset(timeset, timesets[timeset][:period_in_ns])
+            @current_timeset = timeset
+          end
+        end
+
+      else
+        line = line.strip
+        unless line.empty? || line == '}'  # End of pattern
+          Origen.log.warning "Skipped Pattern line #{source_line_number}: #{line}"
+        end
       end
     end
   end

data/lib/origen_stil/processor/base.rb

@@ -1,3 +1,4 @@
+require 'ast'
 module OrigenSTIL
   module Processor
     class Base

data/lib/origen_stil/processor/expression.rb

@@ -0,0 +1,70 @@
+module OrigenSTIL
+  module Processor
+    # Evaluates an expression to a final answer
+    class Expression < Base
+      # Given node should be a top-level expression node, like a :time_expr
+      def run(node, options = {})
+        process(node).value
+      end
+
+      def on_number_with_unit(node)
+        val = node.find(:value).value
+        if p = node.find(:prefix)
+          case p.value
+          when 'E'
+            val = val * 1_000_000_000_000_000_000
+          when 'P'
+            val = val * 1_000_000_000_000_000
+          when 'T'
+            val = val * 1_000_000_000_000
+          when 'G'
+            val = val * 1_000_000_000
+          when 'M'
+            val = val * 1_000_000
+          when 'k'
+            val = val * 1000
+          when 'm'
+            val = val / 1000.0
+          when 'u'
+            val = val / 1_000_000.0
+          when 'n'
+            val = val / 1_000_000_000.0
+          when 'p'
+            val = val / 1_000_000_000_000.0
+          when 'f'
+            val = val / 1_000_000_000_000_000.0
+          when 'a'
+            val = val / 1_000_000_000_000_000_000.0
+          else
+            fail "Unknown number prefix #{p.value}"
+          end
+        end
+        val
+      end
+
+      def on_parens(node)
+        process_all(node.children).first
+      end
+
+      def on_multiply(node)
+        a, b = *process_all(node.children)
+        a * b
+      end
+
+      def on_divide(node)
+        a, b = *process_all(node.children)
+        a / (b * 1.0)
+      end
+
+      def on_add(node)
+        a, b = *process_all(node.children)
+        a + b
+      end
+
+      def on_subtract(node)
+        a, b = *process_all(node.children)
+        a - b
+      end
+    end
+  end
+end

data/lib/origen_stil/processor/pattern.rb

@@ -19,6 +19,7 @@ module OrigenSTIL
 
       def on_pattern_burst(node)
         name, pat_list = *node
+        name = name.value if name.try(:type) == :name
         if pat_list
           @bursts[name] = []
           @current_burst = @bursts[name]
@@ -27,7 +28,9 @@ module OrigenSTIL
       end
 
       def on_pat_list_item(node)
-        @current_burst << node.to_a[0]
+        name = node.to_a[0]
+        name = name.value if name.try(:type) == :name
+        @current_burst << name
       end
     end
   end

data/lib/origen_stil/processor/pin_groups.rb

@@ -11,25 +11,57 @@ module OrigenSTIL
         end
       end
 
+      def on_signal_groups(node)
+        groups = node.children
+        if groups.first.type == :name
+          groups = groups.dup
+          # Not doing anything with named groups currently
+          @current_signal_group_domain = groups.shift.value
+          groups.freeze
+          Origen.log.warning "Signal groups for domain \"#{@current_signal_group_domain}\" are being ignored (support for named signal groups is not implemented yet)"
+          # process_all(groups)
+        else
+          @current_signal_group_domain = nil
+          process_all(groups)
+        end
+      end
+
       def on_signal_group(node)
         name, expr = *node
+        name = OrigenSTIL.unquote(name.value)
+        @current_signal_group = name
         unless model.has_pin?(name)
           ids = process(expr).to_a[0]
           model.add_pin_group name.to_sym, *ids
         end
       end
 
+      def on_name(node)
+        id = node.value
+        if model.has_pin?(id)
+          # Expand any references to another pin group
+          id = id.to_sym
+          if dut.pin_groups.ids.map(&:to_sym).include?(id)
+            model.pin(id).map(&:id)
+          else
+            [id]
+          end
+        else
+          fail "Pin #{id} referenced at #{node.file}:#{node.line_number} but DUT does not have this pin/pin_group"
+        end
+      end
+
       def on_add(node)
         lhs, rhs = *node
         Array(process(lhs)) + Array(process(rhs))
       end
 
       def on_subtract(node)
-        fail 'Subract not implemented yet!'
+        fail 'Subtraction in pin groups is not supported yet'
       end
 
-      def on_paren(node)
-        fail 'Parenthesis not implemented yet!'
+      def on_parens(node)
+        process_all(node.children).first
       end
     end
   end

data/lib/origen_stil/processor/pins.rb

@@ -11,6 +11,7 @@ module OrigenSTIL
 
       def on_signal(node)
         name, direction = *node
+        name = OrigenSTIL.unquote(name)
         if direction == 'In'
           direction = :input
         elsif direction == 'Out'
@@ -36,6 +37,12 @@ module OrigenSTIL
           end
         end
       end
+
+      private
+
+      def unquote(str)
+        str.gsub(/\A("|')|("|')\Z/, '')
+      end
     end
   end
 end

data/lib/origen_stil/processor/timesets.rb

@@ -11,9 +11,15 @@ module OrigenSTIL
 
       def on_waveform_table(node)
         name = node.to_a[0]
-        # Pass on resolving the period for now, could involve parameter cross referencing
-        period = node.find(:period)
+        name = name.value if name.try(:type) == :name
         @timesets[name] = {}
+        if period = node.find(:period)
+          @timesets[name][:period_in_ns] = process_all(period.children).first * 1_000_000_000
+        end
+      end
+
+      def on_time_expr(node)
+        Expression.new.run(node)
       end
     end
   end

data/pattern/example3.rb

@@ -0,0 +1,7 @@
+Pattern.create do
+  tester.set_timeset('func', 100)
+  file = "#{Origen.root}/examples/example3.stil"
+  OrigenSTIL.add_pins(file)
+  dut.pin_pattern_order(*dut.pins.map { |id, pin| id })
+  OrigenSTIL.execute(file)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_stil
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -59,7 +59,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/fix_my_workspace
 - config/application.rb
 - config/boot.rb
 - config/commands.rb
@@ -68,6 +67,7 @@ files:
 - lib/origen_stil.rb
 - lib/origen_stil/pattern.rb
 - lib/origen_stil/processor/base.rb
+- lib/origen_stil/processor/expression.rb
 - lib/origen_stil/processor/pattern.rb
 - lib/origen_stil/processor/pin_groups.rb
 - lib/origen_stil/processor/pins.rb
@@ -75,6 +75,7 @@ files:
 - lib/origen_stil/syntax/node.rb
 - lib/origen_stil/syntax/parser.rb
 - lib/tasks/origen_stil.rake
+- pattern/example3.rb
 - templates/web/index.md.erb
 - templates/web/layouts/_basic.html.erb
 - templates/web/partials/_navbar.html.erb
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Helpers to consume and generate test IP in STIL format (IEEE 1450)

data/bin/fix_my_workspace

@@ -1,100 +0,0 @@
-#!/usr/bin/env ruby
-$VERBOSE = nil  # Don't care about world writable dir warnings and the like
-
-if $_fix_my_workspace_version_check
-  $_fix_my_workspace_version = '0.7.0'
-else
-  if File.exist?(File.expand_path('../../lib/origen.rb', __FILE__))
-    # If this script is being run from within an origen-core workspace, use that Origen-core,
-    # not the system-installed origen-core version.
-    $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-    require 'origen'
-  else
-    # Use system-installed Origen (the gem in system Ruby)
-    require 'origen'
-  end
-
-  if !Origen.site_config.gem_manage_bundler
-    puts 'Sorry but you have opted to manage Bundler yourself via your Origen site config, and this means'
-    puts 'that I cannot make certain assumptions about how your workspace is configured.'
-    puts 'You will need to either resolve this problem yourself, or else change the value of'
-    puts 'gem_mange_bundler to true.'
-    puts 'See here for more details on how to do that: http://origen-sdk.org/origen/guides/starting/company/'
-
-  else
-    ENV['BUNDLE_GEMFILE'] = File.join(Origen.root, 'Gemfile')
-    ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
-    ENV['BUNDLE_BIN'] = File.join(Origen.root, 'lbin')
-
-    # Force copy system gems to local gems
-    if Origen.site_config.gem_use_from_system
-      local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
-      gem_dir = Pathname.new(Gem.dir)
-
-      Origen.site_config.gem_use_from_system.each do |gem, version|
-        begin
-          # This will raise an error if the system doesn't have this gem installed, that
-          # will be rescued below
-          spec = Gem::Specification.find_by_name(gem, version)
-
-          local_dir = File.join(local_gem_dir, Pathname.new(spec.gem_dir).relative_path_from(gem_dir))
-          FileUtils.mkdir_p local_dir
-          FileUtils.cp_r("#{spec.gem_dir}/.", local_dir)
-
-          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.cache_file).relative_path_from(gem_dir)))
-          FileUtils.mkdir_p local_file.dirname
-          FileUtils.cp(spec.cache_file, local_file)
-
-          if spec.extension_dir && File.exist?(spec.extension_dir)
-            local_dir = File.join(local_gem_dir, Pathname.new(spec.extension_dir).relative_path_from(gem_dir))
-            FileUtils.mkdir_p local_dir
-            FileUtils.cp_r("#{spec.extension_dir}/.", local_dir)
-          end
-
-          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.spec_file).relative_path_from(gem_dir)))
-          FileUtils.mkdir_p local_file.dirname
-          FileUtils.cp(spec.spec_file, local_file)
-
-        rescue Gem::LoadError
-          # This just means that one of the gems that should be copied from the system
-          # was not actually installed in the system, so nothing we can do about that here
-        end
-      end
-    end
-
-    # Delete lbin
-    FileUtils.rm_rf(ENV['BUNDLE_BIN']) if File.exist?(ENV['BUNDLE_BIN'])
-
-    # Run bundler with correct switches
-    cmd = "bundle install --gemfile #{ENV['BUNDLE_GEMFILE']} --binstubs #{ENV['BUNDLE_BIN']} --path #{ENV['BUNDLE_PATH']}"
-    `chmod o-w #{Origen.root}` # Stops some annoying world writable warnings during install
-    `chmod o-w #{Origen.root}/bin` if File.exist?("#{Origen.root}/bin")
-    `chmod o-w #{Origen.root}/.bin` if File.exist?("#{Origen.root}/.bin")
-
-    # Try again, this time updating the bundle
-    if system(cmd)
-      fixed = true
-    elsif system 'bundle update'
-      fixed = true
-    end
-
-    if File.exist?(ENV['BUNDLE_BIN'])
-      `chmod o-w #{ENV['BUNDLE_BIN']}`
-
-      # Make .bat versions of all executables, Bundler should really be doing this when running
-      # on windows
-      if Origen.os.windows?
-        Dir.glob("#{ENV['BUNDLE_BIN']}/*").each do |bin|
-          unless bin =~ /.bat$/
-            bat = "#{bin}.bat"
-            unless File.exist?(bat)
-              File.open(bat, 'w') { |f| f.write('@"ruby.exe" "%~dpn0" %*') }
-            end
-          end
-        end
-      end
-    end
-
-    system 'origen -v' if fixed
-  end
-end