origen_testers 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c72ab82702fa6b3444d2676b0034c13a8cc588bb
-  data.tar.gz: d09780ebd3835a17d7e0608af2c11b0a999c0e5e
+  metadata.gz: 560c1e1e8f0793808a3054fbfa0939d9e85fc178
+  data.tar.gz: f8d1745d6e6107d1a092bd420f4bcf92b2419c9d
 SHA512:
-  metadata.gz: 096d65600d67eeb7658221ddb49a74ffe5a8f1c8d76f075a9fe4cca2f1bc361c0127b7f683fb5c539734a5aa36856b56bd09ec8c515f2138ba0847bb13bc5583
-  data.tar.gz: e3aeefaedd366b6a952e62c2a33d92d2edf02703cb9138a567be2638575dc0567454e6937c31d8ae8fec47a56938c673094bf748cfa474e2cfe1259670c6af9b
+  metadata.gz: 43d6f200cf2c285d52c56873debeb66d67a6d77ef873c77cf13f79ab936b064e8d42a2b4968ac1f83912eededa8f3a9b5cf459c3c365c7828d7ea7a20549aec9
+  data.tar.gz: b856f1c9b1dc241c94c90d2ff97122a0ced67c8f5add45b3b44cea5f33cc8083816a284a2355c58aaeb197c9dcdbbc2a0645c01f5d6371111a867dc7ea846913

data/config/version.rb

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

data/lib/origen_testers/api.rb

@@ -144,7 +144,9 @@ module OrigenTesters
         c1(msg)
       end
       @step_comment_on = false
-      c1(step_comment_prefix * (70 / div))
+      timestamp = " #{execution_time_in_ns}ns #{step_comment_prefix}"
+      str = step_comment_prefix * (70 / div)
+      c1 str.sub(/#{step_comment_prefix}{#{timestamp.length - 1}}$/, timestamp)
     end
 
     def snip(number, options = {})

data/lib/origen_testers/generator.rb

@@ -235,8 +235,9 @@ module OrigenTesters
         val = nil
         Origen.file_handler.preserve_current_file do
           Origen.file_handler.default_extension = file_extension
-          file = Origen.file_handler.clean_path_to_sub_template(file)
-          placeholder = compiler.render(file, options)
+          full_path = Origen.file_handler.clean_path_to(file, allow_missing: true)
+          full_path ||= Origen.file_handler.clean_path_to_sub_template(file)
+          placeholder = compiler.render(full_path, options)
           val = compiler.insert(placeholder).chomp
         end
         val

data/lib/origen_testers/vector_generator.rb

@@ -69,20 +69,29 @@ module OrigenTesters
       @vec_count = @vec_count - num
     end
 
-    # init cycle count when first accessed, otherwise return value
+    # Returns the current cycle count
     def cycle_count
       @cycle_count ||= 0
     end
 
+    # Returns the current execution time
+    def execution_time_in_ns
+      @execution_time_in_ns ||= 0
+    end
+
     # increment cycle count
-    def inc_cycle_count(num = 1)
+    def inc_cycle_count(num = 1, options = {})
+      num, options = 1, num if num.is_a?(Hash)
       cycle_count if @cycle_count.nil? # define if not already
+      execution_time_in_ns if @execution_time_in_ns.nil? # define if not already
+      @execution_time_in_ns += num * (options[:period_in_ns] || tester.timeset.period_in_ns)
       @cycle_count = @cycle_count + num
     end
 
     # reset_cycle_count
     def reset_cycle_count(num = 0)
       cycle_count if @cycle_count.nil? # define if not already
+      @execution_time_in_ns = 0
       @cycle_count = num
     end
 
@@ -232,7 +241,7 @@ module OrigenTesters
         v = Vector.new(attrs)
         stage.store Vector.new(attrs)
         inc_vec_count
-        inc_cycle_count(attrs[:repeat] || 1)
+        inc_cycle_count(attrs[:repeat] || 1, period_in_ns: v.timeset.period_in_ns)
         if @preset_next_vector_cleanup
           @preset_next_vector_cleanup.call(v)
           @preset_next_vector_cleanup = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen