Found some extra places to rename cfg_arch to design.

Author: james-ball-qualcomm

backends/arch_gen/lib/arch_gen.rb

@@ -644,7 +644,7 @@ def maybe_add_csr(csr_name, extra_env = {})
       impl_ext
     end
     belongs =
-      csr_obj.exists_in_cfg?(cfg_arch_mock)
+      csr_obj.exists_in_design?(cfg_arch_mock)
 
 
     @implemented_csrs ||= []
@@ -898,7 +898,7 @@ def maybe_add_inst(inst_name, extra_env = {})
       impl_ext
     end
     belongs =
-      inst_obj.exists_in_cfg?(cfg_arch_mock)
+      inst_obj.exists_in_design?(cfg_arch_mock)
 
     @implemented_instructions ||= []
     @implemented_instructions << inst_name if belongs

docs/ruby/Instruction.html

@@ -314,7 +314,7 @@ <h2>
         <li class="public ">
   <span class="summary_signature">
 
-      <a href="#exists_in_cfg%3F-instance_method" title="#exists_in_cfg? (instance method)">#<strong>exists_in_cfg?</strong>(possible_xlens, extensions)  &#x21d2; Boolean </a>
+      <a href="#exists_in_cfg%3F-instance_method" title="#exists_in_design? (instance method)">#<strong>exists_in_design?</strong>(possible_xlens, extensions)  &#x21d2; Boolean </a>
 
 
 
@@ -1310,9 +1310,9 @@ <h3 class="signature " id="excluded_by?-instance_method">
 </div>
 
       <div class="method_details ">
-  <h3 class="signature " id="exists_in_cfg?-instance_method">
+  <h3 class="signature " id="exists_in_design?-instance_method">
 
-    #<strong>exists_in_cfg?</strong>(possible_xlens, extensions)  &#x21d2; <tt>Boolean</tt> 
+    #<strong>exists_in_design?</strong>(possible_xlens, extensions)  &#x21d2; <tt>Boolean</tt> 
 
 
 
@@ -1398,7 +1398,7 @@ <h3 class="signature " id="exists_in_cfg?-instance_method">
     <td>
       <pre class="code"><span class="info file"># File 'lib/arch_def.rb', line 1178</span>
 
-<span class='kw'>def</span> <span class='id identifier rubyid_exists_in_cfg?'>exists_in_cfg?</span><span class='lparen'>(</span><span class='id identifier rubyid_possible_xlens'>possible_xlens</span><span class='comma'>,</span> <span class='id identifier rubyid_extensions'>extensions</span><span class='rparen'>)</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_exists_in_cfg?'>exists_in_design?</span><span class='lparen'>(</span><span class='id identifier rubyid_possible_xlens'>possible_xlens</span><span class='comma'>,</span> <span class='id identifier rubyid_extensions'>extensions</span><span class='rparen'>)</span>
   <span class='lparen'>(</span><span class='ivar'>@data</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>base</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='op'>||</span> <span class='lparen'>(</span><span class='id identifier rubyid_possible_xlens'>possible_xlens</span><span class='period'>.</span><span class='id identifier rubyid_include?'>include?</span><span class='lparen'>(</span><span class='ivar'>@data</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>base</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='rparen'>)</span><span class='rparen'>)</span><span class='rparen'>)</span> <span class='op'>&amp;&amp;</span>
     <span class='id identifier rubyid_extensions'>extensions</span><span class='period'>.</span><span class='id identifier rubyid_any?'>any?</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_defined_by?'>defined_by?</span><span class='lparen'>(</span><span class='id identifier rubyid_e'>e</span><span class='rparen'>)</span> <span class='rbrace'>}</span> <span class='op'>&amp;&amp;</span>
     <span class='id identifier rubyid_extensions'>extensions</span><span class='period'>.</span><span class='id identifier rubyid_none?'>none?</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_excluded_by?'>excluded_by?</span><span class='lparen'>(</span><span class='id identifier rubyid_e'>e</span><span class='rparen'>)</span> <span class='rbrace'>}</span>

docs/ruby/method_list.html

@@ -1142,7 +1142,7 @@ <h1 id="full_list_header">Method List</h1>
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Instruction.html#exists_in_cfg%3F-instance_method" title="Instruction#exists_in_cfg? (method)">#exists_in_cfg?</a></span>
+      <span class='object_link'><a href="Instruction.html#exists_in_cfg%3F-instance_method" title="Instruction#exists_in_design? (method)">#exists_in_design?</a></span>
       <small>Instruction</small>
     </div>
   </li>

lib/arch_obj_models/csr.rb

@@ -338,7 +338,7 @@ def implemented_fields(design)
       end
 
     @implemented_fields = fields.select do |f|
-      f.exists_in_cfg?(design)
+      f.exists_in_design?(design)
     end
   end
 
@@ -521,7 +521,7 @@ def wavedrom_desc(design, effective_xlen, exclude_unimplemented: false, optional
 
         desc["reg"] << { "bits" => n, type: 1 }
       end
-      if design.partially_configured? && field.optional_in_cfg?(design)
+      if design.partially_configured? && field.optional_in_design?(design)
         desc["reg"] << { "bits" => field.location(design, effective_xlen).size, "name" => field.name, type: optional_type }
       else
         desc["reg"] << { "bits" => field.location(design, effective_xlen).size, "name" => field.name, type: 3 }
@@ -540,7 +540,7 @@ def wavedrom_desc(design, effective_xlen, exclude_unimplemented: false, optional
 
   # @param design [Design]
   # @return [Boolean] whether or not the CSR is possibly implemented given the supplies config options
-  def exists_in_cfg?(design)
+  def exists_in_design?(design)
     if design.fully_configured?
       (@data["base"].nil? || (design.possible_xlens.include? @data["base"])) &&
         design.transitive_implemented_extensions.any? { |e| defined_by?(e) }
@@ -552,10 +552,10 @@ def exists_in_cfg?(design)
 
   # @param design [Design]
   # @return [Boolean] whether or not the CSR is optional in the config
-  def optional_in_cfg?(design)
-    raise "optional_in_cfg? should only be used by a partially-specified arch def" unless design.partially_configured?
+  def optional_in_design?(design)
+    raise "optional_in_design? should only be used by a partially-specified arch def" unless design.partially_configured?
 
-    exists_in_cfg?(design) &&
+    exists_in_design?(design) &&
       design.mandatory_extensions.all? do |ext_req|
         ext_req.satisfying_versions.none? do |ext_ver|
           defined_by?(ext_ver)

lib/arch_obj_models/csr_field.rb

@@ -17,9 +17,7 @@ class CsrField < DatabaseObject
 
   # @return [Integer] The base XLEN required for this CsrField to exist. One of [32, 64]
   # @return [nil] if the CsrField exists in any XLEN
-  def base
-    @data["base"]
-  end
+  def base = @data["base"]
 
   # @param parent_csr [Csr] The Csr that defined this field
   # @param field_data [Hash<String,Object>] Field data from the arch spec
@@ -32,28 +30,28 @@ def initialize(parent_csr, field_name, field_data)
   # @param possible_xlens [Array<Integer>] List of xlens that be used in any implemented mode
   # @param extensions [Array<ExtensionVersion>] List of extensions implemented
   # @return [Boolean] whether or not the instruction is implemented given the supplies config options
-  def exists_in_cfg?(design)
+  def exists_in_design?(design)
     if design.fully_configured?
-      parent.exists_in_cfg?(design) &&
+      parent.exists_in_design?(design) &&
         (@data["base"].nil? || design.possible_xlens.include?(@data["base"])) &&
         (@data["definedBy"].nil? || design.transitive_implemented_extensions.any? { |ext_ver| defined_by?(ext_ver) })
     else
       raise "unexpected type" unless design.partially_configured?
 
-      parent.exists_in_cfg?(design) &&
+      parent.exists_in_design?(design) &&
         (@data["base"].nil? || design.possible_xlens.include?(@data["base"])) &&
         (@data["definedBy"].nil? || design.prohibited_extensions.none? { |ext_req| ext_req.satisfying_versions.any? { |ext_ver| defined_by?(ext_ver) } })
     end
   end
 
   # @return [Boolean] For a partially configured design, whether or not the field is optional (not mandatory or prohibited)
-  def optional_in_cfg?(design)
-    raise "optional_in_cfg? should only be called on a partially configured design" unless design.partially_configured?
+  def optional_in_design?(design)
+    raise "optional_in_design? should only be called on a partially configured design" unless design.partially_configured?
 
-    exists_in_cfg?(design) &&
+    exists_in_design?(design) &&
       (
         if data["definedBy"].nil?
-          parent.optional_in_cfg?(design)
+          parent.optional_in_design?(design)
         else
           design.mandatory_extensions.all? do |ext_req|
             ext_req.satisfying_versions.none? do |ext_ver|
@@ -147,7 +145,7 @@ def pruned_type_ast(symtab)
     @pruned_type_asts[symtab_hash] = ast
   end
 
-  # returns the definitive type for a configuration
+  # returns the definitive type for a design
   #
   # @param symtab [SymbolTable] Symbol table
   # @return [String]
@@ -162,7 +160,9 @@ def type(symtab)
     raise ArgumentError, "Argument 1 should be a symtab" unless symtab.is_a?(Idl::SymbolTable)
 
     unless @type_cache.nil?
-      raise "Different design for type #{@type_cache.keys},  #{symtab.design}" unless @type_cache.key?(symtab.design)
+      unless @type_cache.key?(symtab.design)
+        raise "Different design for type #{@type_cache.keys},  #{symtab.design}"
+      end
 
       return @type_cache[symtab.design]
     end

lib/arch_obj_models/instruction.rb

@@ -740,7 +740,7 @@ def excluded_by?(*args)
 
   # @param design [Design] The design
   # @return [Boolean] whether or not the instruction is implemented given the supplies config options
-  def exists_in_cfg?(design)
+  def exists_in_design?(design)
     if design.fully_configured?
       (@data["base"].nil? || (design.possible_xlens.include? @data["base"])) &&
         design.implemented_extensions.any? { |e| defined_by?(e) } &&