origen_testers 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9999dc9b15d3f51a08afdf0e8dd98b7fa3376ee7
-  data.tar.gz: be914aec8a32f1194e449c03a671145dfaf969d2
+  metadata.gz: bb7e94e2ce35ea525eeb90410b24ebe55c8576b7
+  data.tar.gz: 68d99c86782203d2ba107e3bf9233915c67d5f56
 SHA512:
-  metadata.gz: ded3c3e7b07768e69156024f808efb1807db5b0c79cfcc816222c5f93be46efe24410df23199f809733603406e5b49c90d72167faffacf4225b0a78fa626f4fa
-  data.tar.gz: bf0da11b37b262af872f540dbb8894c32dd97a4ff380efade01563002d53573918c89323743ed7bb1d28c43f04b1fb14d63f9d50ca9e083d8962edf431704f29
+  metadata.gz: 1cbd6405ece9a4cc5f0b71facce92e3588b81dbf7d38f1815d6780e45cf0b71400ac8d8d82258892071c750ad3a1eea04a74d453f387f31e88137088ce33ab69
+  data.tar.gz: ad6cfc2654f121f21c14be9cf82e60075eeb0c3b7932a19ab8473a5bd169e87ecf425149eac9c2866da89d4012e1ebf2f29641abe0244963a1872d9c7d7ce98e

data/config/application.rb

@@ -30,11 +30,13 @@ class OrigenTestersApplication < Origen::Application
 
   config.semantically_version = true
 
+  # to handle for web compile where environment/tester not yet defined
+
   # By default all generated output will end up in ./output.
   # Here you can specify an alternative directory entirely, or make it dynamic such that
   # the output ends up in a setup specific directory.
   config.output_directory do
-   dir =  "#{Origen.root}/output/#{$tester.name}"
+   dir =  "#{Origen.root}/output/#{$tester.nil? ? '': $tester.name}"
   # Check if running on windows, if so, substitute :: with _ 
    dir.gsub!("::","_") if Origen.os.windows?
    dir
@@ -43,7 +45,7 @@ class OrigenTestersApplication < Origen::Application
   # Similary for the reference files, generally you want to setup the reference directory
   # structure to mirror that of your output directory structure.
   config.reference_directory do
-    dir = "#{Origen.root}/.ref/#{$tester.name}"
+    dir = "#{Origen.root}/.ref/#{$tester.nil? ? '': $tester.name}"
   # Check if running on windows, if so, substitute :: with _
     dir.gsub!("::","_") if Origen.os.windows?
     dir

data/config/version.rb

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

data/lib/origen_testers/igxl_based_tester/base.rb

@@ -329,7 +329,7 @@ module OrigenTesters
       #     $tester.start_subroutine("wait_for_done")
       #     < generate your subroutine vectors here >
       #     $tester.end_subroutine
-      def start_subroutine(name)
+      def start_subroutine(name, options = {})
         local_subroutines << name.to_s.chomp unless local_subroutines.include?(name.to_s.chomp) || @inhibit_vectors
         microcode "global subr #{name}:"
       end
@@ -343,7 +343,8 @@ module OrigenTesters
       #     < generate your subroutine vectors here >
       #     $tester.end_subroutine
       # cond: whether return is conditional on a flag (to permit to mix subrs together)
-      def end_subroutine(cond = false)
+      def end_subroutine(cond = false, options = {})
+        (cond, options) = false, cond if cond.is_a?(Hash)
         if cond
           update_vector microcode: 'if (flag) return'
         else

data/lib/origen_testers/igxl_based_tester/ultraflex.rb

@@ -42,6 +42,9 @@ module OrigenTesters
 
         @set_msb_issued = false        # Internal flag to keep track of set_msb usage, allowing for set_lsb to be used as a readcode
         @microcode[:keepalive] = 'keepalive'
+
+        @onemodsubs_found = false           # flag to indicate whether a single-module subroutine has been implemented in this pattern
+        @nonmodsubs_found = false           # flag to indicate whether a normal non-single-module subroutine has been implemented in this pattern
       end
 
       # Do a frequency measure.
@@ -302,9 +305,13 @@ module OrigenTesters
                             high_voltage: false,
                             svm_only:     false
                            )) do |pin_list|
-          microcode "#{options[:subroutine_pat] ? 'srm_vector' : 'vm_vector'}"
-          microcode "#{options[:pattern]} ($tset, #{pin_list})"
-          microcode '{'
+          # if subroutine pattern has only single-module subroutines then skip module start
+          # (will be taken care of elsewhere)
+          unless options[:subroutine_pat] && @onemodsubs_found && !@nonmodsubs_found
+            microcode "#{options[:subroutine_pat] ? 'srm_vector' : 'vm_vector'}"
+            microcode "#{options[:pattern]} ($tset, #{pin_list})"
+            microcode '{'
+          end
           # override min vector limit if subroutine pattern
           @min_pattern_vectors = 0 if options[:subroutine_pat]
           unless options[:subroutine_pat]
@@ -314,7 +321,46 @@ module OrigenTesters
       end
 
       def pattern_footer(options = {})
-        super(options.merge(end_module: false))
+        # if subroutine pattern has any single-module subroutines then skip module end
+        # (will be taken care of elsewhere)
+        unless options[:subroutine_pat] && @onemodsubs_found
+          super(options.merge(end_module: false))
+        end
+      end
+
+      # allow for option of separate modules for each subroutine
+      # requirement is that any subroutines in their own module (options[:onemodsub] = true)
+      # MUST be implemented AFTER any subroutines in the common pattern module!
+      def start_subroutine(name, options = {})
+        if options[:onemodsub]
+          if @nonmodsubs_found && !@onemodsubs_found
+            # this means we need to do end module for non-single-module subroutines
+            # do only once!
+            pattern_footer(options.merge(subroutine_pat: true, end_module: false))
+          end
+          @onemodsubs_found = true  # importnat put this after the call to pattern_footer above
+          pin_list = ordered_pins.map(&:name).join(', ')
+          microcode 'srm_vector'
+          microcode "#{name}_module ($tset, #{pin_list})"
+          microcode '{'
+        else
+          # normal subroutine to use common
+          if @onemodsubs_found
+            # give error -- requirement is that any normal subroutines using common pattern module
+            # must be done BEFORE any subroutines that need their own module definition!
+            fail "ERROR: Cannot implement any common module subroutines (#{name}) after implementing any single-module subroutines in the same pattern!"
+          end
+          @nonmodsubs_found = true
+        end
+        super(name, options)
+      end
+
+      def end_subroutine(cond = false, options = {})
+        (cond, options) = false, cond if cond.is_a?(Hash)
+        super(cond, options)
+        if options[:onemodsub]
+          microcode '}'
+        end
       end
 
       # Generates a match loop based on vector condition passed in via block

data/lib/origen_testers/test/dut.rb

@@ -65,16 +65,17 @@ module OrigenTesters
       end
 
       def execute(options = {})
-        options = { define: false,          # whether to define subr or call it
-                    name:   'executefunc1'
+        options = { define:    false,          # whether to define subr or call it
+                    name:      'executefunc1',
+                    onemodsub: false        # whether to expects subr to be in single module
                 }.merge(options)
 
         if options[:define]
           # define subroutine
-          $tester.start_subroutine(options[:name])
-          $tester.cycle
-          $tester.end_subroutine
+          $tester.start_subroutine(options[:name], onemodsub: options[:onemodsub])
           $tester.cycle
+          $tester.end_subroutine(onemodsub: options[:onemodsub])
+          $tester.cycle unless options[:onemodsub]
         else
           # call subroutine
           $tester.cycle

data/pattern/subroutines.rb

@@ -39,7 +39,26 @@ unless $tester.v93k?
 
         # Define digsrc_overlay subr
         $dut.digsrc_overlay(:subr_name => 'digsrc_overlay', :define => true, overlay_cycle_num: 64)
+
+        # test out single module subroutine capability, integrated with other normal subroutines
+        # only for UltraFLEX
+        $dut.execute(define: true, name: 'overlaysub1', onemodsub: true )
+        $dut.execute(define: true, name: 'overlaysub2', onemodsub: true )
+        $dut.execute(define: true, name: 'overlaysub3', onemodsub: true )
+        $dut.execute(define: true, name: 'overlaysub4', onemodsub: true )
+
       end 
     end
+
+    if $tester.ultraflex?
+       # test out single module subroutine capability in standalone pattern
+       # only for UltraFLEX
+      Pattern.create(name: 'subroutines2', subroutine_pat: true) do
+        $dut.execute(define: true, name: 'overlaysub5', onemodsub: true )
+        $dut.execute(define: true, name: 'overlaysub6', onemodsub: true )
+        $dut.execute(define: true, name: 'overlaysub7', onemodsub: true )
+        $dut.execute(define: true, name: 'overlaysub4', onemodsub: true )
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen