tint: intrinsics.def Support [[precedence]] decoration

Add support for a [[precedence(N)]] decoration on intrinsic table type
declarations. This will be used to ensure the type with the lowest
conversion rank is matched when a matcher could match multiple types
for a given abstract numeric argument type.

Bug: tint:1504
Change-Id: I96475b000c0917bbfa4e2873b1731ce048b96a7d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/90664
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/tint/intrinsics.def

@@ -62,13 +62,18 @@ enum texel_format {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WGSL primitive types                                                       //
+// Types may be decorated with [[precedence(N)]] to prioritize which type     //
+// will be picked when multiple types of a matcher match.                     //
+// This is used to ensure that abstract numerical types materialize to the    //
+// concrete type with the lowest conversion rank.                             //
+// Types with higher the precedence values will be matched first.             //
 ////////////////////////////////////////////////////////////////////////////////
 
 // https://gpuweb.github.io/gpuweb/wgsl/#plain-types-section
 type bool
-type f32
+[[precedence(2)]] type i32
-type i32
+[[precedence(1)]] type u32
-type u32
+[[precedence(0)]] type f32
 type vec2<T>
 type vec3<T>
 type vec4<T>

src/tint/resolver/intrinsic_table.inl.tmpl

@@ -248,7 +248,7 @@ class {{$class}} : public TypeMatcher {
 };
 
 const sem::Type* {{$class}}::Match(MatchState& state, const sem::Type* ty) const {
-{{- range .Types }}
+{{- range .PrecedenceSortedTypes }}
   if (match_{{.Name}}(ty)) {
     return build_{{.Name}}(state);
   }

tools/src/cmd/intrinsic-gen/parser/parser.go

@@ -142,7 +142,7 @@ func (p *parser) decorations() ast.Decorations {
 		values := []string{}
 		if p.match(tok.Lparen) != nil {
 			for p.err == nil {
-				values = append(values, p.string())
+				values = append(values, string(p.next().Runes))
 				if p.match(tok.Comma) == nil {
 					break
 				}

tools/src/cmd/intrinsic-gen/parser/parser_test.go

@@ -100,6 +100,16 @@ func TestParser(t *testing.T) {
 					Name: "T",
 				}},
 			},
+		}, { ///////////////////////////////////////////////////////////////////
+			utils.ThisLine(),
+			`[[deco(1, "x")]] type T`, ast.AST{
+				Types: []ast.TypeDecl{{
+					Decorations: ast.Decorations{
+						{Name: "deco", Values: []string{"1", "x"}},
+					},
+					Name: "T",
+				}},
+			},
 		}, { ///////////////////////////////////////////////////////////////////
 			utils.ThisLine(),
 			"match M : A",

tools/src/cmd/intrinsic-gen/resolver/resolve.go

@@ -17,6 +17,7 @@ package resolver
 import (
 	"fmt"
 	"sort"
+	"strconv"
 
 	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/ast"
 	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/sem"
@@ -179,6 +180,17 @@ func (r *resolver) ty(a ast.TypeDecl) error {
 		}
 		t.DisplayName = d.Values[0]
 	}
+	if d := a.Decorations.Take("precedence"); d != nil {
+		if len(d.Values) != 1 {
+			return fmt.Errorf("%v expected a single integer value for 'precedence' decoration", d.Source)
+		}
+		n, err := strconv.Atoi(d.Values[0])
+		if err != nil {
+			return fmt.Errorf("%v %v", d.Source, err)
+		}
+		t.Precedence = n
+	}
+
 	if len(a.Decorations) != 0 {
 		return fmt.Errorf("%v unknown decoration", a.Decorations[0].Source)
 	}

tools/src/cmd/intrinsic-gen/sem/sem.go

@@ -16,6 +16,7 @@ package sem
 
 import (
 	"fmt"
+	"sort"
 
 	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/ast"
 )
@@ -89,6 +90,7 @@ type Type struct {
 	Decl           ast.TypeDecl
 	Name           string
 	DisplayName    string
+	Precedence     int
 }
 
 // TypeMatcher declares a type matcher
@@ -99,6 +101,13 @@ type TypeMatcher struct {
 	Types          []*Type
 }
 
+func (t TypeMatcher) PrecedenceSortedTypes() []*Type {
+	out := make([]*Type, len(t.Types))
+	copy(out, t.Types)
+	sort.Slice(out, func(i, j int) bool { return out[i].Precedence > out[j].Precedence })
+	return out
+}
+
 // EnumMatcher declares a enum matcher
 type EnumMatcher struct {
 	TemplateParams []TemplateParam