Forgot to stage

Author: james-ball-qualcomm

arch/crd/MockCRD-1.yaml

@@ -28,13 +28,20 @@ MockCRD-1:
     parameters:
       MOCK_ENUM_2_INTS: {}
       MOCK_ENUM_2_STRINGS: {}
-      MOCK_BOOL: {}
-      MOCK_64_BIT_INT: {}
+      MOCK_BOOL_1: {}
+      MOCK_BOOL_2:
+        schema:
+          const: true
+      MOCK_1_BIT_INT: {}
+      MOCK_2_BIT_INT: {}
       MOCK_25_BIT_INT: {}
-      MOCK_INT_RANGE: {}
-      MOCK_INT_ENUM_ARRAY: {}
-      MOCK_BOOL_ARRAY_OF_8_FIRST_2_FALSE: {}
-      MOCK_STRING_ENUM_ARRAY:
+      MOCK_64_BIT_INT: {}
+      MOCK_INT_RANGE_0_TO_127: {}
+      MOCK_INT_RANGE_0_TO_128: {}
+      MOCK_INT_RANGE_1_TO_128: {}
+      MOCK_ARRAY_INT_ENUM: {}
+      MOCK_ARRAY_BOOL_ARRAY_OF_8_FIRST_2_FALSE: {}
+      MOCK_ARRAY_STRING_ENUM:
         schema:
           contains: { const : DEF }
   - name: I

arch/ext/MockExt.yaml

@@ -6,7 +6,7 @@ MockExt:
   description: This is just for testing
   versions:
   - version: "1.0.0"
-    state: ratified
+    state: development
   params:
     MOCK_ENUM_2_INTS:
       description: foo
@@ -17,8 +17,12 @@ MockExt:
       description: foo
       schema:
         type: string
-        enum: ["high", "low"]
-    MOCK_BOOL:
+        enum: ["low", "high"]
+    MOCK_BOOL_1:
+      description: foo
+      schema:
+        type: boolean
+    MOCK_BOOL_2:
       description: foo
       schema:
         type: boolean
@@ -28,19 +32,49 @@ MockExt:
         type: integer
         minimum: 0
         maximum: 0xffffffffffffffff
+    MOCK_1_BIT_INT:
+      description: foo
+      schema:
+        type: integer
+        minimum: 0
+        maximum: 1
+    MOCK_2_BIT_INT:
+      description: foo
+      schema:
+        type: integer
+        minimum: 0
+        maximum: 3
     MOCK_25_BIT_INT:
       description: foo
       schema:
         type: integer
         minimum: 0
         maximum: 33554431
-    MOCK_INT_RANGE:
+    MOCK_INT_RANGE_0_TO_2:
+      description: foo
+      schema:
+        type: integer
+        minimum: 0
+        maximum: 2
+    MOCK_INT_RANGE_0_TO_127:
       description: foo
       schema:
         type: integer
         minimum: 0
         maximum: 127
-    MOCK_INT_ENUM_ARRAY:
+    MOCK_INT_RANGE_0_TO_128:
+      description: foo
+      schema:
+        type: integer
+        minimum: 0
+        maximum: 128
+    MOCK_INT_RANGE_1_TO_128:
+      description: foo
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 128
+    MOCK_ARRAY_INT_ENUM:
       description: foo
       schema:
         type: array
@@ -50,14 +84,30 @@ MockExt:
         minItems: 1
         maxItems: 2
         uniqueItems: true
-    MOCK_STRING_ENUM_ARRAY:
+    MOCK_ARRAY_MIN_ONLY:
+      description: foo
+      schema:
+        type: array
+        items:
+          type: integer
+          enum: [0, 1]
+        minItems: 3
+    MOCK_ARRAY_MAX_ONLY:
+      description: foo
+      schema:
+        type: array
+        items:
+          type: integer
+          enum: [0, 1]
+        maxItems: 10
+    MOCK_ARRAY_STRING_ENUM:
       description: foo
       schema:
         type: array
         items:
           type: string
           enum: [ABC, DEF, GHI]
-    MOCK_BOOL_ARRAY_OF_8_FIRST_2_FALSE:
+    MOCK_ARRAY_BOOL_ARRAY_OF_8_FIRST_2_FALSE:
       description: foo
       schema:
         type: array

arch/ext/Sm.yaml

@@ -243,16 +243,16 @@ Sm:
 
         [separator="!"]
         !===
-        ! high ! Misaligned load/store/AMO exceptions are always higher priority than load/store/AMO page-fault and access-fault exceptions.
         ! low  ! Misaligned load/store/AMO exceptions are always lower priority than load/store/AMO page-fault and access-fault exceptions.
+        ! high ! Misaligned load/store/AMO exceptions are always higher priority than load/store/AMO page-fault and access-fault exceptions.
         !===
 
         MISALIGNED_LDST_EXCEPTION_PRIORITY cannot be "high" when MAX_MISALIGNED_ATOMICITY_GRANULE_SIZE
         is non-zero, since the atomicity of an access cannot be determined in that case until after
         address translation.
       schema:
         type: string
-        enum: ["high", "low"]
+        enum: ["low", "high"]
         extra_validation: |
           assert (MISALIGNED_LDST_EXCEPTION_PRIORITY == "low") if MAX_MISALIGNED_ATOMICITY_GRANULE_SIZE.positive?
     MAX_MISALIGNED_ATOMICITY_GRANULE_SIZE:
@@ -407,7 +407,7 @@ Sm:
         Must be greater than or equal to _max_(`PHYS_ADDR_WIDTH`, `VA_SIZE`)
       schema:
         type: integer
-        maximum: 0xffffffffffffffff
+        maximum: 64
     CONFIG_PTR_ADDRESS:
       description: |
         Physical address of the unified discovery configuration data structure.

lib/arch_obj_models/crd.rb

@@ -151,24 +151,32 @@ def in_scope_extensions
   end
 
   # @return [Array<ExtensionRequirements>] - # Extensions with their CRD information.
-  # XXX Good example of why I filed issue 75
-  def in_scope_ext_reqs
-    return @in_scope_ext_reqs unless @in_scope_ext_reqs.nil?
-
-    @in_scope_ext_reqs = []
+  # If desired_status is provided, only returns extensions with that status.
+  def in_scope_ext_reqs(desired_status = nil)
+    in_scope_ext_reqs = []
     @data["extensions"]&.each do |ext_crd|
-      status = ext_crd["status"]
-      raise "Missing extension status for extension #{ext_crd["name"]}" if status.nil?
+      actual_status = ext_crd["status"]
+      raise "Missing extension status for extension #{ext_crd["name"]}" if actual_status.nil?
 
-      if (status != "mandatory") && (status != "optional")
-        raise "Unknown extension status of #{status} for extension #{ext_crd["name"]}" 
+      if (actual_status != "mandatory") && (actual_status != "optional")
+        raise "Unknown extension status of #{actual_status} for extension #{ext_crd["name"]}" 
       end
 
-      @in_scope_ext_reqs << 
-        ExtensionRequirement.new(ext_crd["name"], ext_crd["version"], status: status,
-          note: ext_crd["note"], req_id: "REQ-EXT-" + ext_crd["name"])
+      add = false
+
+      if desired_status.nil?
+        add = true
+      elsif desired_status == actual_status
+        add = true
+      end
+
+      if add
+        in_scope_ext_reqs << 
+          ExtensionRequirement.new(ext_crd["name"], ext_crd["version"], status: actual_status,
+            note: ext_crd["note"], req_id: "REQ-EXT-" + ext_crd["name"])
+      end
     end
-    @in_scope_ext_reqs
+    in_scope_ext_reqs
   end
 
   ###################################
@@ -185,32 +193,31 @@ def initialize(param_db, schema_hash, note)
       raise ArgumentError, "Expecting schema_hash to be a hash" unless schema_hash.is_a?(Hash)
 
       @param_db = param_db
-      @schema_constraint = Schema.new(schema_hash)
+      @schema_crd = Schema.new(schema_hash)
       @note = note
     end
 
     def single_value?
-      @schema_constraint.single_value?
+      @schema_crd.single_value?
     end
 
     def name
       @param_db.name
     end
 
-    def value
-      raise "Parameter schema_constraint for #{@param_db.name} is not a single value" unless single_value?
-
-      @schema_constraint.value
+    def idl_type
+      @param_db.type
     end
 
-    # Pretty convert just CRD's parameter constraint to a string.
-    def schema_constraint_pretty
-      @schema_constraint.pretty
+    def value
+      raise "Parameter schema_crd for #{name} is not a single value" unless single_value?
+
+      @schema_crd.value
     end
 
-    # Pretty convert CRD's parameter constraint merged with extension schema to a string.
-    def schema_merge_pretty
-      Schema.new(@param_db.schema).merge!(@schema_constraint).pretty
+    # Pretty convert CRD's parameter constraint merged into extension schema to a string.
+    def schema_pretty_crd_merged_with_param_db
+      Schema.new(@param_db.schema).merge!(@schema_crd).to_pretty_s
     end
 
     # sorts by name

lib/arch_obj_models/extension.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "obj"
+require_relative "schema"
 
 # A parameter (AKA option, AKA implementation-defined value) supported by an extension
 class ExtensionParameter
@@ -26,6 +27,11 @@ class ExtensionParameter
   # @returns [Idl::Type] Type of the parameter
   attr_reader :type
 
+  # Pretty convert extension schema to a string.
+  def schema_type
+    Schema.new(@schema).to_pretty_s
+  end
+
   def initialize(name, desc, schema, extra_validation, exts)
     @name = name
     @desc = desc

lib/arch_obj_models/schema.rb

@@ -7,27 +7,28 @@ def initialize(schema_hash)
         @schema_hash = schema_hash
     end
 
-    def pretty(schema_hash = @schema_hash)
+    def to_pretty_s(schema_hash = @schema_hash)
       raise ArgumentError, "Expecting hash" unless schema_hash.is_a?(Hash)
       raise ArgumentError, "Expecting non-empty hash" if schema_hash.empty?
 
       if schema_hash.key?("const")
         "#{schema_hash["const"]}"
       elsif schema_hash.key?("enum")
-        "One of: [#{schema_hash["enum"].join(', ')}]"
+        "[#{schema_hash["enum"].join(', ')}]"
       elsif schema_hash.key?("type")
         case schema_hash["type"]
         when "integer"
           min = schema_hash["minimum"]
           max = schema_hash["maximum"]
           if min && max
-            "#{min} to #{max}"
+            sz = num_bits(min, max)
+            (sz > 0) ? "#{sz}-bit integer" : "#{min} to #{max}"
           elsif min
             "≥ #{min}"
           elsif max
             "≤ #{max}"
           else
-            "any integer"
+            "integer"
           end
         when "string"
           format = schema_hash["format"]
@@ -42,14 +43,50 @@ def pretty(schema_hash = @schema_hash)
         when "boolean"
           "boolean"
         when "array"
-          "TODO: array"
+          items = schema_hash["items"]
+          min_items = schema_hash["minItems"]
+          max_items = schema_hash["maxItems"]
+          size_str = if min_items && max_items
+            if min_items == max_items
+                "#{min_items}-element "
+            else
+                "#{min_items}-element to #{max_items}-element "
+            end
+          elsif min_items
+            "at least #{min_items}-element "
+          elsif max_items
+            "at most #{max_items}-element "
+          else
+            ""
+          end
+
+          if items.nil? 
+            size_str + "array"
+          else 
+            if items.is_a?(Hash)
+              "#{size_str}array of #{to_pretty_s(items)}"
+            elsif items.is_a?(Array)
+              str = size_str + "array where: +\n"
+              items.each_with_index do |item,index|
+                str = str + "  [#{index}] is #{to_pretty_s(item)} +\n"
+              end
+              additional_items = schema_hash["additionalItems"]
+              if additional_items
+                str = str + "additional items are: +\n  " + 
+                  to_pretty_s(additional_items)
+              end
+              str
+            else
+              raise "to_pretty_s unknown array items #{items} in #{schema_hash}"
+            end
+          end
         else
-          raise "TODO: Pretty schema unknown type #{schema_hash["type"]} in #{schema_hash}"
+          raise "to_pretty_s unknown type #{schema_hash["type"]} in #{schema_hash}"
         end
       elsif schema_hash.key?("contains")
-        "Contains : [#{pretty(schema_hash["contains"])}]"
+        "Contains : [#{to_pretty_s(schema_hash["contains"])}]"
       else
-        raise "TODO: Pretty schema for #{schema_hash}"
+        raise "TODO: to_pretty_s schema for #{schema_hash}"
       end
     end
 
@@ -72,5 +109,17 @@ def value
 
       @schema_hash["const"]
     end
+
+    def is_power_of_two?(num)
+      return false if num < 1
+      return (num & (num-1)) == 0
+    end
+
+    # If min to max range represents an unsigned number of bits, return the number of bits.
+    # Otherwise return 0
+    def num_bits(min, max)
+        return 0 unless min == 0
+        is_power_of_two?(max+1) ? max.bit_length : 0
+    end
 end