origen_testers 0.52.15 → 0.54.0

data/lib/origen_testers/smartest_based_tester/decompiler/avc.rb

@@ -24,8 +24,7 @@ module OrigenTesters
           end
           OrigenTesters::Decompiler::Nodes::Frontmatter.new(context:        context,
                                                             pattern_header: header,
-                                                            comments:       []
-                                                           )
+                                                            comments:       [])
         end
 
         def parse_pinlist(raw_pinlist:, context:)
@@ -35,16 +34,14 @@ module OrigenTesters
           # up the names.
           # E.g.: FORMAT TCLK TDI TDO TMS;
           OrigenTesters::Decompiler::Nodes::Pinlist.new(context: context,
-                                                        pins:    raw_pinlist[raw_pinlist.index('FORMAT')..raw_pinlist.index(';') - 1].split(/\s+/)[1..-1].map(&:strip)
-                                                       )
+                                                        pins:    raw_pinlist[raw_pinlist.index('FORMAT')..raw_pinlist.index(';') - 1].split(/\s+/)[1..-1].map(&:strip))
         end
 
         def parse_vector(raw_vector:, context:, meta:)
           if raw_vector =~ Regexp.new('^\s*#')
             # Comment
             OrigenTesters::Decompiler::Nodes::CommentBlock.new(context:  context,
-                                                               comments: raw_vector.split("\n")
-                                                              )
+                                                               comments: raw_vector.split("\n"))
           elsif raw_vector =~ Regexp.new('^R\d+\s')
             # Vector
             elements = raw_vector.split(/\s+/, 2 + context.pinlist.size)
@@ -56,8 +53,7 @@ module OrigenTesters
                                         repeat:     elements[0].gsub('R', '').to_i,
                                         timeset:    elements[1],
                                         pin_states: (elements[2..-2] || []) << elements[-1][0],
-                                        comment:    elements[-1][1]
-                                       )
+                                        comment:    elements[-1][1])
           else
             # Anything that doesn't start with Rxyz where xyz is some integer
             # will be considered a sequencer instruction
@@ -66,8 +62,7 @@ module OrigenTesters
 
             nodes_namespace::SequencerInstruction.new(context:     context,
                                                       instruction: inst_plus_args[0],
-                                                      arguments:   inst_plus_args[1..-1]
-                                                     )
+                                                      arguments:   inst_plus_args[1..-1])
           end
         end
       end

data/lib/origen_testers/smartest_based_tester/decompiler/nodes.rb

@@ -5,7 +5,7 @@ module OrigenTesters
         class SequencerInstruction < OrigenTesters::Decompiler::Nodes::Node
           PLATFORM_NODES = [:instruction, :arguments]
 
-          def initialize(instruction:, arguments: [], context:)
+          def initialize(instruction:, context:, arguments: [])
             @execute = false
 
             @instruction = instruction

data/lib/origen_testers/smartest_based_tester/decompiler.rb

@@ -27,6 +27,7 @@ module OrigenTesters
           if current_indices[:pinlist_start] && line !~ /^\s/
             next true
           end
+
           false
         end,
 

data/lib/origen_testers/smartest_based_tester/smt8.rb

@@ -9,8 +9,7 @@ module OrigenTesters
 
       # An internal method called by Origen to create the pattern header
       def pattern_header(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         @program_lines = []
         @program_action_lines = []
         if zip_patterns
@@ -40,7 +39,7 @@ module OrigenTesters
       # An internal method called by Origen to generate the pattern footer
       def pattern_footer(options = {})
         options = {
-          end_in_ka:      false
+          end_in_ka: false
         }.merge(options)
         if options[:end_in_ka]
           Origen.log.warning '93K keep alive not yet implemented!'
@@ -128,9 +127,9 @@ module OrigenTesters
             elsif comment =~ /^SQPG LBGN (\d+);/
               @program_lines << "    <Instruction id=\"loop\" value=\"#{Regexp.last_match(1)}\"/>"
             elsif comment =~ /^SQPG LEND;/
-              @program_lines << "    <Instruction id=\"loopEnd\"/>"
+              @program_lines << '    <Instruction id="loopEnd"/>'
             elsif comment =~ /^SQPG RETC (\d) (\d);/
-              @program_lines << "    <Instruction id=\"returnConditional\">"
+              @program_lines << '    <Instruction id="returnConditional">'
               @program_lines << "      <Assignment id=\"onFail\" value=\"#{Regexp.last_match(1) == '0' ? 'false' : 'true'}\"/>"
               @program_lines << "      <Assignment id=\"resetFail\" value=\"#{Regexp.last_match(2) == '0' ? 'false' : 'true'}\"/>"
               @program_lines << '    </Instruction>'
@@ -150,7 +149,7 @@ module OrigenTesters
           # Close out current gen_vec group
           write_gen_vec
           if has_repeat
-            @program_lines << "    <Instruction id=\"genVec\" value=\"1\">"
+            @program_lines << '    <Instruction id="genVec" value="1">'
             @program_lines << "      <Assignment id=\"repeat\" value=\"#{vec.repeat}\"/>"
             @program_lines << '    </Instruction>'
             @gen_vec -= 1

data/lib/origen_testers/smartest_based_tester/v93k/test_suite.rb

@@ -38,8 +38,7 @@ module OrigenTesters
              hardware_dsp_disable
              site_control
              site_match
-             force_serial
-          )
+             force_serial)
 
         ALIASES = {
           tim_equ_set:     :timing_equation,

data/lib/origen_testers/smartest_based_tester/v93k.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   module SmartestBasedTester
     class V93K < Base
-      require 'origen_testers/smartest_based_tester/v93k/generator.rb'
+      require 'origen_testers/smartest_based_tester/v93k/generator'
     end
   end
   V93K = SmartestBasedTester::V93K

data/lib/origen_testers/smartest_based_tester/v93k_smt8/shmoo_test.rb

@@ -23,8 +23,7 @@ module OrigenTesters
           signal:  :result_signal
         }
 
-        DEFAULTS = {
-        }
+        DEFAULTS = {}
 
         NO_STRING_TYPES = [:list_strings, :list_classes, :class]
         # Generate accessors for all attributes and their aliases
@@ -76,6 +75,7 @@ module OrigenTesters
               if axes_names.include?(aname.to_sym)
                 fail "Axis name #{aname} is already used in shmoo test '#{@name}'"
               end
+
               axes << ShmooTestAxis.new(aname.to_sym, a)
             end
           else
@@ -250,6 +250,7 @@ module OrigenTesters
               if trackings_names.include?(tname.to_sym)
                 fail "Tracking name #{tname} is already used in shmoo test axis '#{@name}'"
               end
+
               trackings << ShmooTestTracking.new(tname.to_sym, t)
             end
           end

data/lib/origen_testers/smartest_based_tester/v93k_smt8/test_suite.rb

@@ -27,8 +27,7 @@ module OrigenTesters
           test_function: :test_method
         }
 
-        DEFAULTS = {
-        }
+        DEFAULTS = {}
 
         NO_STRING_TYPES = [:list_strings, :list_classes, :class]
         # Generate accessors for all attributes and their aliases
@@ -88,22 +87,23 @@ module OrigenTesters
             unless name.is_a?(String)
               name = name.to_s[0] == '_' ? name.to_s.camelize(:upper) : name.to_s.camelize(:lower)
             end
+            formatted_value = test_method.format(param.last.is_a?(Hash) ? name : param[0])
             if param.last.is_a? Hash
-              if !test_method.format(name).nil? && !test_method.format(name).is_a?(Hash)
-                fail "#{name} parameter structure requires a Hash but value provided is #{test_method.format(name).class}"
-              elsif test_method.format(name).nil? && tester.print_all_params
+              if !formatted_value.nil? && !formatted_value.is_a?(Hash)
+                fail "#{name} parameter structure requires a Hash but value provided is #{formatted_value.class}"
+              elsif formatted_value.nil? && tester.print_all_params
                 l = add_nested_params(l, name, 'param0', {}, param.last, 1)
-              elsif test_method.format(name).nil?
+              elsif formatted_value.nil?
                 # Do nothing
               else
-                test_method.format(name).each do |key, meta_hash|
+                formatted_value.each do |key, meta_hash|
                   l = add_nested_params(l, name, key, meta_hash, param.last, 1)
                 end
               end
-            elsif NO_STRING_TYPES.include?(param.last) && test_method.format(param[0]).is_a?(String) && !test_method.format(param[0]).empty?
-              l << "    #{name} = #{test_method.format(param[0])};"
+            elsif NO_STRING_TYPES.include?(param.last) && formatted_value.is_a?(String) && !formatted_value.empty?
+              l << "    #{name} = #{formatted_value};"
             else
-              l << "    #{name} = #{wrap_if_string(test_method.format(param[0]))};"
+              l << "    #{name} = #{wrap_if_string(formatted_value)};"
             end
           end
           l << '}'
@@ -112,52 +112,56 @@ module OrigenTesters
 
         # rubocop:disable Metrics/ParameterLists: Avoid parameter lists longer than 5 parameters.
         def add_nested_params(l, name, key, value_hash, nested_params, nested_loop_count)
-          nested_params_accepted_keys = []
-          skip_keys                   = []
+          nested_params_accepted_keys = {}
+          skip_keys = {}
           unless value_hash.nil?
             unless value_hash.is_a?(Hash)
               fail "Provided value to nested params was not a Hash. Instead the value was #{value_hash.class}"
             end
+
             dynamic_spacing = ' ' * (4 * nested_loop_count)
             l << "#{dynamic_spacing}#{name}[#{key}] = {" unless name.nil?
+            # Normalize once per hash rather than once per accepted parameter.
+            value_hash = value_hash.transform_keys(&:to_sym)
+            @nested_parameter_keys ||= {}
             nested_params.each do |nested_param|
-              # Guarentee hash is using all symbol keys
-              # Since we cannot guarentee ruby version is greater than 2.5, we have to use an older syntax to
-              value_hash = value_hash.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo }
-              nested_key = nested_param.first.to_s.gsub('.', '_').to_sym
-              nested_key_underscore = nested_key.to_s.underscore.to_sym
-              nested_params_accepted_keys << nested_key
-              nested_params_accepted_keys << nested_key_underscore
+              nested_key, nested_key_underscore = @nested_parameter_keys[nested_param.first] ||= begin
+                key_name = nested_param.first.to_s.gsub('.', '_').to_sym
+                [key_name, key_name.to_s.underscore.to_sym]
+              end
+              nested_params_accepted_keys[nested_key] = true
+              nested_params_accepted_keys[nested_key_underscore] = true
               # We cannot create nested member functions with aliases
               # Requirement for hash parameter passing is to pass one of the key types and not both
               if value_hash.keys.include?(nested_key) &&
                  value_hash.keys.include?(nested_key_underscore) && nested_key != nested_key_underscore
                 fail 'You are using a hash based test method and provided both the parameter name and alias name.'
               end
+
               nested_key = nested_key_underscore if value_hash.keys.include?(nested_key_underscore)
               if nested_param.last.first.is_a?(Hash) && value_hash[nested_key].is_a?(Hash)
                 value_hash[nested_key].each do |inner_key, inner_meta_hash|
                   l = add_nested_params(l, nested_param.first, inner_key, value_hash.dig(nested_key, inner_key), nested_param.last.first, nested_loop_count + 1)
-                  skip_keys << nested_key
+                  skip_keys[nested_key] = true
                 end
               elsif nested_param.last.first.is_a?(Hash) && tester.print_all_params
                 l = add_nested_params(l, nested_param.first, 'param0', {}, nested_param.last.first, nested_loop_count + 1)
               end
               type = nested_param.last.first
-              if NO_STRING_TYPES.include?(nested_param.last.first) && value_hash[nested_key] && !skip_keys.include?(nested_key)
+              if NO_STRING_TYPES.include?(nested_param.last.first) && value_hash[nested_key] && !skip_keys.key?(nested_key)
                 l << "    #{dynamic_spacing}#{nested_param.first} = #{test_method.handle_val_type(value_hash[nested_key], type, nested_param.first)};"
-              elsif value_hash[nested_key] && !skip_keys.include?(nested_key)
+              elsif value_hash[nested_key] && !skip_keys.key?(nested_key)
                 l << "    #{dynamic_spacing}#{nested_param.first} = #{wrap_if_string(test_method.handle_val_type(value_hash[nested_key], type, nested_param.first))};"
-              elsif NO_STRING_TYPES.include?(nested_param.last.first) && !nested_param.last.last.is_a?(Hash) && tester.print_all_params && !skip_keys.include?(nested_key)
+              elsif NO_STRING_TYPES.include?(nested_param.last.first) && !nested_param.last.last.is_a?(Hash) && tester.print_all_params && !skip_keys.key?(nested_key)
                 l << "    #{dynamic_spacing}#{nested_param.first} = #{test_method.handle_val_type(nested_param.last.last, type, nested_param.first)};"
-              elsif !nested_param.last.last.is_a?(Hash) && tester.print_all_params && !skip_keys.include?(nested_key)
+              elsif !nested_param.last.last.is_a?(Hash) && tester.print_all_params && !skip_keys.key?(nested_key)
                 l << "    #{dynamic_spacing}#{nested_param.first} = #{wrap_if_string(test_method.handle_val_type(nested_param.last.last, type, nested_param.first))};"
               end
             end
             l << "#{dynamic_spacing}};" unless name.nil?
             # Sanity check there are not overpassed parameters
             value_hash.keys.each do |nested_key|
-              unless nested_params_accepted_keys.include?(nested_key.to_sym)
+              unless nested_params_accepted_keys.key?(nested_key.to_sym)
                 fail "You provided a parameter \'#{nested_key}\' that was not an accepted parameter to the hash parameter \'#{name}\'"
               end
             end
@@ -170,7 +174,7 @@ module OrigenTesters
           if value.is_a?(String)
             if value =~ /setupRef(.*)/
               # Do not wrap setupRef calls in quotes
-              return value
+              value
             else
               "\"#{value}\""
             end

data/lib/origen_testers/smartest_based_tester/v93k_smt8.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   module SmartestBasedTester
     class V93K_SMT8 < Base
-      require 'origen_testers/smartest_based_tester/v93k_smt8/generator.rb'
+      require 'origen_testers/smartest_based_tester/v93k_smt8/generator'
     end
   end
   V93K_SMT8 = SmartestBasedTester::V93K_SMT8

data/lib/origen_testers/stil_based_tester/base.rb

@@ -65,8 +65,7 @@ module OrigenTesters
 
       # An internal method called by Origen to create the pattern header
       def pattern_header(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
 
         @pattern_name = options[:pattern]
 
@@ -242,7 +241,7 @@ module OrigenTesters
                     end
                     if v == 0
                       line << 'L'
-                    elsif v == 0
+                    elsif v == 0 # rubocop:disable Lint/DuplicateElsifCondition
                       line << 'H'
                     else
                       line << 'L/H/X'
@@ -301,12 +300,12 @@ module OrigenTesters
       # other platforms, such as the J750, is required.
       def store(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = { offset: 0
-                  }.merge(options)
+        options = { offset: 0 }.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For the STIL generation you must supply the pins to store/capture'
         end
+
         pins.each do |pin|
           pin.restore_state do
             pin.capture
@@ -326,12 +325,12 @@ module OrigenTesters
       #   $tester.cycle                # This is the vector that will be captured
       def store_next_cycle(*pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
         pins = pins.flatten.compact
         if pins.empty?
           fail 'For STIL generation you must supply the pins to store/capture'
         end
+
         pins.each { |pin| pin.save; pin.capture }
         # Register this clean up function to be run after the next vector
         # is generated, cool or what!

data/lib/origen_testers/test/custom_test_interface.rb

@@ -116,12 +116,12 @@ module OrigenTesters
                     # An optional finalize function can be supplied to do any final test instance configuration, this
                     # function will be called immediately before the test method is finally rendered. The test method
                     # object itself will be passed in as an argument.
-                    finalize:    lambda  do |tm|
+                    finalize:    lambda do |tm|
                       tm.my_arg3 = 'arg3_set_from_finalize'
                     end,
                     # Example of a custom method.
                     # In all cases the test method object will be passed in as the first argument.
-                    set_my_arg4: lambda  do |tm, val|
+                    set_my_arg4: lambda do |tm, val|
                       tm.my_arg4 = val
                     end
                   }
@@ -143,7 +143,7 @@ module OrigenTesters
                     # An optional finalize function can be supplied to do any final test instance configuration, this
                     # function will be called immediately before the test method is finally rendered. The test method
                     # object itself will be passed in as an argument.
-                    finalize:    lambda  do |tm|
+                    finalize: lambda do |tm|
                       if tm.my_arg1 == 'DELETE_ME'
                         tm.remove_parameter(:my_arg1)
                       end
@@ -185,8 +185,8 @@ module OrigenTesters
                     my_arg0: [:string, ''],
                     my_arg1: [:string, 'a_default_value'],
                     my_arg2: [:integer, 0],
-                    my_arg2: [:list_strings, %w(E1 E2)],
-                    my_arg3: [:list_classes, %w(E1 E2)]
+                    my_arg3: [:list_strings, %w(E1 E2)],
+                    my_arg4: [:list_classes, %w(E1 E2)]
                   }]
                   # Define any methods you want the test method to have
                 }
@@ -214,12 +214,12 @@ module OrigenTesters
                     # An optional finalize function can be supplied to do any final test instance configuration, this
                     # function will be called immediately before the test instance is finally rendered. The test instance
                     # object itself will be passed in as an argument.
-                    finalize:    lambda  do |ti|
+                    finalize:    lambda do |ti|
                       ti.my_arg3 = 'arg3_set_from_finalize'
                     end,
                     # Example of a custom method.
                     # In all cases the test method object will be passed in as the first argument.
-                    set_my_arg4: lambda  do |ti, val|
+                    set_my_arg4: lambda do |ti, val|
                       ti.my_arg4 = val
                     end
                   }

data/lib/origen_testers/test/dut.rb

@@ -107,10 +107,11 @@ module OrigenTesters
       end
 
       def execute(options = {})
-        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)
+        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
@@ -128,13 +129,14 @@ module OrigenTesters
 
       # Match loop functionality
       def match(options = {})
-        options = { type:        :match_pin,    # whether to match DONE bit in register or match pin
-                    # :match_done
-                    # :match_2pins
-                    delay_in_us: 5,           # match loop delay
-                    define:      false,       # whether to define subr or call it
-                    subr_name:   false,       # default use match type as subr name
-                }.merge(options)
+        options = {
+          type:        :match_pin,    # whether to match DONE bit in register or match pin
+          # :match_done
+          # :match_2pins
+          delay_in_us: 5,             # match loop delay
+          define:      false,         # whether to define subr or call it
+          subr_name:   false          # default use match type as subr name
+        }.merge(options)
 
         subr_name = options[:subr_name] ? options[:subr_name] : options[:type].to_s
 
@@ -226,7 +228,7 @@ module OrigenTesters
 
       def handshake(options = {})
         options = {
-          define: false,          # whether to define subr or call it
+          define: false          # whether to define subr or call it
         }.merge(options)
 
         if options[:define]
@@ -261,12 +263,13 @@ module OrigenTesters
       alias_method :keep_alive, :keepalive
 
       def digsrc_overlay(options = {})
-        options = { define:            false,       # whether to define subr or call it
-                    subr_name:         false,       # default use match type as subr name
-                    digsrc_pins:       @digsrc_pins, # defaults to what's defined in $dut
-                    overlay_reg:       nil, # defaults to testme32 register
-                    overlay_cycle_num: 32, # Only needed if overlay_reg is NOT nil, this specificies how many clk cycles to overlay.
-                }.merge(options)
+        options = {
+          define:            false,        # whether to define subr or call it
+          subr_name:         false,        # default use match type as subr name
+          digsrc_pins:       @digsrc_pins, # defaults to what's defined in $dut
+          overlay_reg:       nil,          # defaults to testme32 register
+          overlay_cycle_num: 32            # Only needed if overlay_reg is NOT nil
+        }.merge(options)
         if options[:define]
           $tester.start_subroutine(options[:subr_name]) # Start subroutine
           digsrc_pins = $tester.assign_digsrc_pins(options[:digsrc_pins])
@@ -301,8 +304,7 @@ module OrigenTesters
       end
 
       def memory_test(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
 
         $tester.memory_test(inc_counter_x: true, gen_vector: true)
 
@@ -318,8 +320,7 @@ module OrigenTesters
       end
 
       def freq_count(options = {})
-        options = {
-        }.merge(options)
+        options = {}.merge(options)
 
         $tester.freq_count($dut.pin(:tdo), readcode: 73)
       end

data/lib/origen_testers/test/interface.rb

@@ -667,7 +667,7 @@ module OrigenTesters
         def ac_specset(sheet_name, expression, options = {})
           options = {
             specset: :default,
-            nom:     { typ:  nil }
+            nom:     { typ: nil }
           }.merge(options)
 
           ss = ac_specsets(sheet_name)
@@ -677,7 +677,7 @@ module OrigenTesters
         # Collects AC Spec object(s) from the given expression and adds them to the given Specset
         def collect_ac_specs(ssname, edge, options = {})
           options = {
-            nom: { typ:  nil }
+            nom: { typ: nil }
           }.merge(options)
 
           # Create a Specsets object from the UFlex program generator API
@@ -698,8 +698,9 @@ module OrigenTesters
           }.merge(options)
 
           return unless expression.is_a? String
+
           # collect all variable names within the expression
-          vars = expression.scan(/[a-zA-Z][\w]+/).map(&:to_sym)
+          vars = expression.scan(/[a-zA-Z]\w+/).map(&:to_sym)
           vars.each do |var|
             next if var =~ /^(d0_edge|d1_edge|d2_edge|d3_edge|c1_edge|c2_edge)$/
             # The substitutions below are used for backward compatibility
@@ -734,8 +735,8 @@ module OrigenTesters
             vcl:       -1,            # Voltage clamp low
             vch:       2.5,            # Voltage clamp high
             vt:        0.9,            # Termination voltage
-            voutlotyp: 0,            #
-            vouthityp: 0,            #
+            voutlotyp: 0,
+            vouthityp: 0,
             dmode:     'Largeswing-VT' # Driver mode
           }.merge(options)
 
@@ -801,7 +802,8 @@ module OrigenTesters
           }.merge(options)
 
           return unless expression.is_a? String
-          vars = expression.scan(/[a-zA-Z][\w]+/).map(&:to_sym)
+
+          vars = expression.scan(/[a-zA-Z]\w+/).map(&:to_sym)
           vars.each do |var|
             next if var =~ /^(nA|uA|mA|A|nV|uV|mV|V)$/i
 
@@ -844,7 +846,7 @@ module OrigenTesters
 
         def reference(reference, options = {})
           options = {
-            comment:        nil
+            comment: nil
           }.merge(options)
 
           references('Refs').add(reference, options)

data/lib/origen_testers/test/nvm.rb

@@ -48,7 +48,7 @@ module OrigenTesters
 
     class NVMSub < NVM
       def redefine_data_reg
-        add_reg :data,      0x40,   16,  d: { pos: 0, bits: 16 }
+        add_reg :data, 0x40, 16, d: { pos: 0, bits: 16 }
       end
 
       # Tests that the block format for defining registers works
@@ -57,7 +57,7 @@ module OrigenTesters
         # This is dreg
         add_reg :dreg, 0x1000, size: 16 do
           # This is dreg bit 15
-          bit 15,    :bit15, reset: 1
+          bit 15, :bit15, reset: 1
           # **Bit 14** - This does something cool
           #
           # 0 | Coolness is disabled
@@ -86,7 +86,7 @@ module OrigenTesters
           bit 15,    :bit15, reset: 1, description: 'This is dreg3 bit 15'
           bit 14, :bit14, description: "**Bit 14** - This does something cool\n\n0 | Coolness is disabled\n1 | Coolness is enabled"
           bits 13..8, :upper, description: 'This is dreg3 bit upper'
-          bit 7..0,  :lower, writable: false, reset: 0x55, description: "This is dreg3 bit lower\nThis is dreg3 bit lower line 2"
+          bit 7..0, :lower, writable: false, reset: 0x55, description: "This is dreg3 bit lower\nThis is dreg3 bit lower line 2"
         end
       end
     end

data/lib/origen_testers/timing/timeset.rb

@@ -65,7 +65,6 @@ module OrigenTesters
         end
 
         # Return the period
-        p
       end
 
       # Indicates whether a period_in_ns has been defined for this timeset.
@@ -134,7 +133,6 @@ module OrigenTesters
         #  )
         # end
         @period_in_ns = p
-        @period_in_ns
       end
     end
   end

data/lib/origen_testers/timing/timing_api.rb

@@ -142,7 +142,7 @@ module OrigenTesters
           time_in_ns:     0,
           time_in_ms:     0,
           time_in_s:      0,
-          match:          false,   # Set to true to invoke a match loop where the supplied delay
+          match:          false   # Set to true to invoke a match loop where the supplied delay
           # will become the timeout duration
         }.merge(options)
 
@@ -255,8 +255,7 @@ module OrigenTesters
       #   end
       def count(options = {})
         options = { period_in_cycles: 0, period_in_ms: 0, period_in_us: 0, period_in_ns: 0,
-                    duration_in_cycles: 0, duration_in_ms: 0, duration_in_us: 0, duration_in_ns: 0
-                  }.merge(options)
+                    duration_in_cycles: 0, duration_in_ms: 0, duration_in_us: 0, duration_in_ns: 0 }.merge(options)
 
         period_cycles = options[:period_in_cycles] + ms_to_cycles(options[:period_in_ms]) +
                         us_to_cycles(options[:period_in_us]) + ns_to_cycles(options[:period_in_ns])

data/lib/origen_testers/vector.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   # A simple class to model a vector
   class Vector
-    attr_accessor :repeat, :microcode, :timeset, :pin_vals,
+    attr_accessor :repeat, :microcode, :timeset, :pin_vals, # rubocop:disable Lint/DuplicateMethods
                   :number, :cycle_number, :dont_compress,
                   :comments, :inline_comment, :cycle, :number, :contains_capture
 
@@ -12,7 +12,7 @@ module OrigenTesters
       end
     end
 
-    def comments
+    def comments # rubocop:disable Lint/DuplicateMethods
       @comments ||= []
     end
 
@@ -73,6 +73,7 @@ module OrigenTesters
         if timeset.period_in_ns % tset.period_in_ns != 0
           fail "The period of timeset #{timeset.name} is not a multiple of the period of timeset #{tset.name}!"
         end
+
         if contains_capture
           vector_modification_required = true
         elsif $tester.timing_toggled_pins.empty?
@@ -177,7 +178,7 @@ module OrigenTesters
       Origen.app.pin_map.sort_by { |id, pin| pin.order }.map { |id, pin| pin }
     end
 
-    def microcode=(val)
+    def microcode=(val) # rubocop:disable Lint/DuplicateMethods
       if val && has_microcode? && @microcode != val
         fail "Trying to assign microcode: #{val}, but vector already has microcode: #{@microcode}"
       else
@@ -186,7 +187,7 @@ module OrigenTesters
     end
 
     # Since repeat 0 is non-intuitive every vector implicitly has a repeat of 1
-    def repeat
+    def repeat # rubocop:disable Lint/DuplicateMethods
       @repeat || 1
     end
 
@@ -196,7 +197,7 @@ module OrigenTesters
 
     def ==(obj)
       if obj.is_a?(Vector)
-        self.has_microcode? == obj.has_microcode? &&
+        has_microcode? == obj.has_microcode? &&
           timeset == obj.timeset &&
           pin_vals == obj.pin_vals
       else