udb 0.1.4 → 0.1.6

data/.data/spec/std/isa/isa/globals.isa

@@ -936,6 +936,8 @@ function xlen {
         } else {
           unreachable();
         }
+      } else {
+        unreachable();
       }
     }
   }

data/.data/spec/std/isa/isa/util.idl

@@ -147,6 +147,28 @@ function count_leading_zeros {
   }
 }
 
+function count_leading_zeros_64 {
+  returns
+    XReg  # Number of leading zeros in +value+
+  arguments
+    U32 N,               # bit width
+    Bits<64> value           # value to count zero in
+  description {
+    Returns the number of leading 0 bits before the most-significant 1 bit of +value+,
+    or N if value is zero.
+  }
+  body {
+    for (U32 i=0; i < N; i++) {
+      if (value[N - 1 - i] == 1) {
+        return i;
+      }
+    }
+
+    # fall-through; value must be zero
+    return N;
+  }
+}
+
 function sext {
   returns XReg
   arguments XReg value, XReg first_extended_bit

data/.data/spec/std/isa/param/SCOUNTENABLE_EN.yaml

@@ -39,4 +39,4 @@ requirements:
     When mhpmcounter[i] does not exist, it cannot be enabled.
 definedBy:
   extension:
-    name: Sm
+    name: S

data/lib/udb/cfg_arch.rb

@@ -287,7 +287,12 @@ module Udb
 
       explicitly_implemented_extension_versions.each do |ext_ver|
         unless ext_ver.requirements_condition.satisfied_by_cfg_arch?(self) == SatisfiedResult::Yes
-          reasons << "Extension requirement is unmet: #{ext_ver}. Needs: #{ext_ver.requirements_condition.minimize(expand: true).to_s_with_value(self, expand: false)}"
+          failing = ext_ver.requirements_condition.failing_conjuncts(self, expand: false)
+          reasons << "Extension requirement is unmet: #{ext_ver}. " + if failing.empty?
+            "Condition not yet determined: #{ext_ver.requirements_condition.to_s_with_value(self, expand: false)}"
+          else
+            "Failing condition(s):\n" + failing.map { |f| "  - #{f}" }.join("\n")
+          end
         end
       end
 
@@ -295,15 +300,25 @@ module Udb
       config.param_values.each do |param_name, param_value|
         p = T.must(param(param_name))
         unless p.defined_by_condition.satisfied_by_cfg_arch?(self) == SatisfiedResult::Yes
+          failing = p.defined_by_condition.failing_conjuncts(self, expand: false)
           reasons << [
             "Parameter is not defined by this config: '#{param_name}'.",
-            "Needs: #{p.defined_by_condition.minimize(expand: true).to_s_with_value(self, expand: false)}"
+            if failing.empty?
+              "Condition not yet determined: #{p.defined_by_condition.to_s_with_value(self, expand: false)}"
+            else
+              "Failing condition(s):\n" + failing.map { |f| "  - #{f}" }.join("\n")
+            end
           ].join("\n")
         end
         unless p.requirements_condition.satisfied_by_cfg_arch?(self) == SatisfiedResult::Yes
+          failing = p.requirements_condition.failing_conjuncts(self, expand: false)
           reasons << [
             "Parameter requirements not met: '#{param_name}'.",
-            "Needs: #{p.requirements_condition.minimize(expand: true).to_s_with_value(self, expand: false)}"
+            if failing.empty?
+              "Condition not yet determined: #{p.requirements_condition.to_s_with_value(self, expand: false)}"
+            else
+              "Failing condition(s):\n" + failing.map { |f| "  - #{f}" }.join("\n")
+            end
           ].join("\n")
         end
       end
@@ -357,7 +372,12 @@ module Udb
       reasons = []
       mandatory_extension_reqs.each do |ext_req|
         if ext_req.requirements_condition.satisfied_by_cfg_arch?(self) != SatisfiedResult::Yes
-          reasons << "Requirement of #{ext_req} are not met: #{ext_req.requirements_condition.to_s_with_value(self, expand: false)}"
+          failing = ext_req.requirements_condition.failing_conjuncts(self, expand: false)
+          reasons << "Requirement of #{ext_req} are not met:\n" + if failing.empty?
+            "  Condition not yet determined: #{ext_req.requirements_condition.to_s_with_value(self, expand: false)}"
+          else
+            failing.map { |f| "  - #{f}" }.join("\n")
+          end
         end
       end
 
@@ -414,11 +434,27 @@ module Udb
         # check that parameter is defined by the partial config (e.g., is defined by a mandatory
         # extension and/or other param value).
         unless p.defined_by_condition.satisfied_by_cfg_arch?(self) == SatisfiedResult::Yes
-          reasons << "Parameter is not defined by this config: '#{param_name}'. Needs #{p.defined_by_condition}"
+          failing = p.defined_by_condition.failing_conjuncts(self, expand: false)
+          reasons << [
+            "Parameter is not defined by this config: '#{param_name}'.",
+            if failing.empty?
+              "Condition not yet determined: #{p.defined_by_condition.to_s_with_value(self, expand: false)}"
+            else
+              "Failing condition(s):\n" + failing.map { |f| "  - #{f}" }.join("\n")
+            end
+          ].join("\n")
         end
 
         if p.requirements_condition.satisfied_by_cfg_arch?(self) == SatisfiedResult::No
-          reasons << "Parameter requirements cannot be met: '#{param_name}'. Needs: #{p.requirements_condition}"
+          failing = p.requirements_condition.failing_conjuncts(self, expand: false)
+          reasons << [
+            "Parameter requirements cannot be met: '#{param_name}'.",
+            if failing.empty?
+              "Condition not yet determined: #{p.requirements_condition.to_s_with_value(self, expand: false)}"
+            else
+              "Failing condition(s):\n" + failing.map { |f| "  - #{f}" }.join("\n")
+            end
+          ].join("\n")
         end
       end
 

data/lib/udb/condition.rb

@@ -333,6 +333,10 @@ module Udb
     sig { abstract.params(cfg_arch: ConfiguredArchitecture, expand: T::Boolean).returns(String) }
     def to_s_with_value(cfg_arch, expand:); end
 
+    # returns the failing conjuncts (clauses that are false) for the given cfg_arch
+    sig { abstract.params(cfg_arch: ConfiguredArchitecture, expand: T::Boolean).returns(T::Array[String]) }
+    def failing_conjuncts(cfg_arch, expand:); end
+
     # string representation of condition in Asciidoc
     sig { abstract.returns(String) }
     def to_asciidoc; end
@@ -1151,7 +1155,7 @@ module Udb
         elsif cfg_arch.partially_configured?
           cb = make_cb_proc do |term|
             if term.is_a?(ExtensionTerm)
-              if cfg_arch.mandatory_extension_reqs.any? { |cfg_ext_req| cfg_ext_req.satisfied_by?(term.to_ext_req(cfg_arch)) }
+              if cfg_arch.mandatory_extension_reqs.any? { |cfg_ext_req| term.to_ext_req(cfg_arch).satisfied_by?(cfg_ext_req) }
                 SatisfiedResult::Yes
               elsif cfg_arch.possible_extension_versions.any? { |cfg_ext_ver| term.to_ext_req(cfg_arch).satisfied_by?(cfg_ext_ver) }
                 SatisfiedResult::Maybe
@@ -1273,7 +1277,7 @@ module Udb
               SatisfiedResult::Yes
             end
           elsif cfg_arch.partially_configured?
-            if cfg_arch.mandatory_extension_reqs.any? { |cfg_ext_req| cfg_ext_req.satisfied_by?(term.to_ext_req(cfg_arch)) }
+            if cfg_arch.mandatory_extension_reqs.any? { |cfg_ext_req| term.to_ext_req(cfg_arch).satisfied_by?(cfg_ext_req) }
               SatisfiedResult::Yes
             elsif cfg_arch.possible_extension_versions.any? { |cfg_ext_ver| term.to_ext_req(cfg_arch).satisfied_by?(cfg_ext_ver) }
               SatisfiedResult::Maybe
@@ -1312,6 +1316,60 @@ module Udb
       to_logic_tree(expand:).to_s_with_value(cb, format: LogicNode::LogicSymbolFormat::C)
     end
 
+    sig { override.params(cfg_arch: ConfiguredArchitecture, expand: T::Boolean).returns(T::Array[String]) }
+    def failing_conjuncts(cfg_arch, expand: false)
+      cb = LogicNode.make_eval_cb do |term|
+        case term
+        when ExtensionTerm
+          if cfg_arch.fully_configured?
+            ext_ver = cfg_arch.implemented_extension_version(term.name)
+            if ext_ver.nil? || !term.to_ext_req(cfg_arch).satisfied_by?(ext_ver)
+              SatisfiedResult::No
+            else
+              SatisfiedResult::Yes
+            end
+          elsif cfg_arch.partially_configured?
+            if cfg_arch.mandatory_extension_reqs.any? { |cfg_ext_req| term.to_ext_req(cfg_arch).satisfied_by?(cfg_ext_req) }
+              SatisfiedResult::Yes
+            elsif cfg_arch.possible_extension_versions.any? { |cfg_ext_ver| term.to_ext_req(cfg_arch).satisfied_by?(cfg_ext_ver) }
+              SatisfiedResult::Maybe
+            else
+              SatisfiedResult::No
+            end
+          else
+            SatisfiedResult::Maybe
+          end
+        when ParameterTerm
+          if cfg_arch.fully_configured?
+            if cfg_arch.param_values.key?(term.name)
+              term.eval(cfg_arch)
+            else
+              SatisfiedResult::No
+            end
+          elsif cfg_arch.partially_configured?
+            term.eval(cfg_arch)
+          else
+            SatisfiedResult::Maybe
+          end
+        when XlenTerm
+          if cfg_arch.possible_xlens.include?(term.xlen)
+            if cfg_arch.possible_xlens.size == 1
+              SatisfiedResult::Yes
+            else
+              SatisfiedResult::Maybe
+            end
+          else
+            SatisfiedResult::No
+          end
+        else
+          raise "unexpected term type #{term.class.name}"
+        end
+      end
+      to_logic_tree(expand:).failing_conjuncts(cb).map do |node|
+        node.to_s_with_value(cb, format: LogicNode::LogicSymbolFormat::C)
+      end
+    end
+
     sig { override.returns(String) }
     def to_asciidoc
       to_logic_tree(expand: false).to_asciidoc(include_versions: false)
@@ -1690,6 +1748,9 @@ module Udb
     sig { override.params(cfg_arch: ConfiguredArchitecture, expand: T::Boolean).returns(String) }
     def to_s_with_value(cfg_arch, expand: false) = "true"
 
+    sig { override.params(cfg_arch: ConfiguredArchitecture, expand: T::Boolean).returns(T::Array[String]) }
+    def failing_conjuncts(cfg_arch, expand: false) = []
+
     sig { override.returns(String) }
     def to_asciidoc = "true"
 
@@ -1803,6 +1864,9 @@ module Udb
     sig { override.params(cfg_arch: ConfiguredArchitecture, expand: T::Boolean).returns(String) }
     def to_s_with_value(cfg_arch, expand: false) = "false"
 
+    sig { override.params(cfg_arch: ConfiguredArchitecture, expand: T::Boolean).returns(T::Array[String]) }
+    def failing_conjuncts(cfg_arch, expand: false) = ["false"]
+
     sig { override.returns(String) }
     def to_asciidoc = "false"
 

data/lib/udb/logic.rb

@@ -1058,8 +1058,10 @@ module Udb
           cv <=> T.cast(other_param.comparison_value, String)
         elsif cv.is_a?(Array)
           cv <=> T.cast(other_param.comparison_value, T::Array[T.any(String, T::Boolean, Integer)])
-        else
+        elsif cv.is_a?(Integer)
           T.cast(comparison_value, Integer) <=> T.cast(other_param.comparison_value, Integer)
+        else
+          T.cast(comparison_value, T::Boolean) <=> T.cast(other_param.comparison_value, T::Boolean)
         end
       else
         # these are the same (ignoring reason)
@@ -1689,6 +1691,27 @@ module Udb
       end
     end
 
+    sig { params(eval_cb: EvalCallbackType).returns(T::Array[LogicNode]) }
+    def failing_conjuncts(eval_cb)
+      if @type == LogicNodeType::And
+        # Evaluate each original child independently to find failing conjuncts
+        child_replace_cb = LogicNode.make_replace_cb do |tn|
+          r = eval_cb.call(T.cast(tn.children.fetch(0), TermType))
+          case r
+          when SatisfiedResult::Yes   then LogicNode::True
+          when SatisfiedResult::No    then LogicNode::False
+          when SatisfiedResult::Maybe then tn
+          else T.absurd(r)
+          end
+        end
+        node_children.select do |child|
+          child.replace_terms(child_replace_cb).reduce.type == LogicNodeType::False
+        end
+      else
+        [self]
+      end
+    end
+
     sig { params(callback: EvalCallbackType).returns(SatisfiedResult) }
     def eval_cb(callback)
       case @type
@@ -2696,6 +2719,9 @@ module Udb
           if xor_with_self
             # xor with self if always false
             False
+          elsif reduced.node_children.all? { |c| c.type == LogicNodeType::True || c.type == LogicNodeType::False }
+            # all children are literals: xor is true iff exactly one child is true
+            reduced.node_children.count { |c| c.type == LogicNodeType::True } == 1 ? True : False
           else
             reduced
           end

data/lib/udb/version.rb

@@ -5,5 +5,5 @@
 # frozen_string_literal: true
 
 module Udb
-  def self.version = "0.1.4"
+  def self.version = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Derek Hower
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-26 00:00:00.000000000 Z
+date: 2026-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport