diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 71cd2dc5e2..259a26b51f 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -334,9 +334,6 @@ libtint_source_set("libtint_core_all_src") {
     "ast/void.h",
     "ast/workgroup_attribute.cc",
     "ast/workgroup_attribute.h",
-    "builtin_table.cc",
-    "builtin_table.h",
-    "builtin_table.inl",
     "castable.cc",
     "castable.h",
     "clone_context.cc",
@@ -370,6 +367,9 @@ libtint_source_set("libtint_core_all_src") {
     "reader/reader.h",
     "resolver/dependency_graph.cc",
     "resolver/dependency_graph.h",
+    "resolver/intrinsic_table.cc",
+    "resolver/intrinsic_table.h",
+    "resolver/intrinsic_table.inl",
     "resolver/resolver.cc",
     "resolver/resolver.h",
     "resolver/resolver_constants.cc",
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 4d10bcbeb3..682817f7bd 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -223,9 +223,6 @@ set(TINT_LIB_SRCS
   ast/void.h
   ast/workgroup_attribute.cc
   ast/workgroup_attribute.h
-  builtin_table.cc
-  builtin_table.h
-  builtin_table.inl
   castable.cc
   castable.h
   clone_context.cc
@@ -251,6 +248,9 @@ set(TINT_LIB_SRCS
   reader/reader.h
   resolver/dependency_graph.cc
   resolver/dependency_graph.h
+  resolver/intrinsic_table.cc
+  resolver/intrinsic_table.h
+  resolver/intrinsic_table.inl
   resolver/resolver.cc
   resolver/resolver_constants.cc
   resolver/resolver.h
@@ -727,7 +727,6 @@ if(TINT_BUILD_TESTS)
     ast/variable_test.cc
     ast/vector_test.cc
     ast/workgroup_attribute_test.cc
-    builtin_table_test.cc
     castable_test.cc
     clone_context_test.cc
     debug_test.cc
@@ -756,6 +755,7 @@ if(TINT_BUILD_TESTS)
     resolver/host_shareable_validation_test.cc
     resolver/increment_decrement_validation_test.cc
     resolver/inferred_type_test.cc
+    resolver/intrinsic_table_test.cc
     resolver/is_host_shareable_test.cc
     resolver/is_storeable_test.cc
     resolver/pipeline_overridable_constant_test.cc
diff --git a/src/tint/builtins.def b/src/tint/intrinsics.def
similarity index 100%
rename from src/tint/builtins.def
rename to src/tint/intrinsics.def
diff --git a/src/tint/builtin_table.cc b/src/tint/resolver/intrinsic_table.cc
similarity index 99%
rename from src/tint/builtin_table.cc
rename to src/tint/resolver/intrinsic_table.cc
index 1a3c9cc79f..7656e55429 100644
--- a/src/tint/builtin_table.cc
+++ b/src/tint/resolver/intrinsic_table.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/tint/builtin_table.h"
+#include "src/tint/resolver/intrinsic_table.h"
 
 #include <algorithm>
 #include <limits>
@@ -770,7 +770,7 @@ struct BuiltinInfo {
     OverloadInfo const* const overloads;
 };
 
-#include "builtin_table.inl"
+#include "intrinsic_table.inl"
 
 /// BuiltinPrototype describes a fully matched builtin function, which is
 /// used as a lookup for building unique sem::Builtin instances.
@@ -820,8 +820,8 @@ bool operator==(const BuiltinPrototype& a, const BuiltinPrototype& b) {
     return true;
 }
 
-/// Impl is the private implementation of the BuiltinTable interface.
-class Impl : public BuiltinTable {
+/// Impl is the private implementation of the IntrinsicTable interface.
+class Impl : public IntrinsicTable {
   public:
     explicit Impl(ProgramBuilder& builder);
 
@@ -1116,11 +1116,11 @@ std::string MatchState::NumName() {
 
 }  // namespace
 
-std::unique_ptr<BuiltinTable> BuiltinTable::Create(ProgramBuilder& builder) {
+std::unique_ptr<IntrinsicTable> IntrinsicTable::Create(ProgramBuilder& builder) {
     return std::make_unique<Impl>(builder);
 }
 
-BuiltinTable::~BuiltinTable() = default;
+IntrinsicTable::~IntrinsicTable() = default;
 
 /// TypeInfo for the Any type declared in the anonymous namespace above
 TINT_INSTANTIATE_TYPEINFO(Any);
diff --git a/src/tint/builtin_table.h b/src/tint/resolver/intrinsic_table.h
similarity index 78%
rename from src/tint/builtin_table.h
rename to src/tint/resolver/intrinsic_table.h
index 89f7e90478..e9760a5696 100644
--- a/src/tint/builtin_table.h
+++ b/src/tint/resolver/intrinsic_table.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_TINT_BUILTIN_TABLE_H_
-#define SRC_TINT_BUILTIN_TABLE_H_
+#ifndef SRC_TINT_RESOLVER_INTRINSIC_TABLE_H_
+#define SRC_TINT_RESOLVER_INTRINSIC_TABLE_H_
 
 #include <memory>
 #include <string>
@@ -28,15 +28,15 @@ class ProgramBuilder;
 
 namespace tint {
 
-/// BuiltinTable is a lookup table of all the WGSL builtin functions
-class BuiltinTable {
+/// IntrinsicTable is a lookup table of all the WGSL builtin functions
+class IntrinsicTable {
   public:
     /// @param builder the program builder
-    /// @return a pointer to a newly created BuiltinTable
-    static std::unique_ptr<BuiltinTable> Create(ProgramBuilder& builder);
+    /// @return a pointer to a newly created IntrinsicTable
+    static std::unique_ptr<IntrinsicTable> Create(ProgramBuilder& builder);
 
     /// Destructor
-    virtual ~BuiltinTable();
+    virtual ~IntrinsicTable();
 
     /// Lookup looks for the builtin overload with the given signature, raising
     /// an error diagnostic if the builtin was not found.
@@ -51,4 +51,4 @@ class BuiltinTable {
 
 }  // namespace tint
 
-#endif  // SRC_TINT_BUILTIN_TABLE_H_
+#endif  // SRC_TINT_RESOLVER_INTRINSIC_TABLE_H_
diff --git a/src/tint/builtin_table.inl b/src/tint/resolver/intrinsic_table.inl
similarity index 100%
rename from src/tint/builtin_table.inl
rename to src/tint/resolver/intrinsic_table.inl
diff --git a/src/tint/builtin_table.inl.tmpl b/src/tint/resolver/intrinsic_table.inl.tmpl
similarity index 99%
rename from src/tint/builtin_table.inl.tmpl
rename to src/tint/resolver/intrinsic_table.inl.tmpl
index b7604b84a9..931ae247ae 100644
--- a/src/tint/builtin_table.inl.tmpl
+++ b/src/tint/resolver/intrinsic_table.inl.tmpl
@@ -4,7 +4,7 @@ Template file for use with tools/builtin-gen to generate builtin_table.inl
 Used by BuiltinTable.cc for builtin overload resolution.
 
 See:
-* tools/cmd/builtin-gen/gen for structures used by this template
+* tools/cmd/intrinsic-gen/gen for structures used by this template
 * https://golang.org/pkg/text/template/ for documentation on the template syntax
 --------------------------------------------------------------------------------
 */ -}}
diff --git a/src/tint/builtin_table_test.cc b/src/tint/resolver/intrinsic_table_test.cc
similarity index 92%
rename from src/tint/builtin_table_test.cc
rename to src/tint/resolver/intrinsic_table_test.cc
index 48cdc18047..c4f4fd4b23 100644
--- a/src/tint/builtin_table_test.cc
+++ b/src/tint/resolver/intrinsic_table_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/tint/builtin_table.h"
+#include "src/tint/resolver/intrinsic_table.h"
 
 #include "gmock/gmock.h"
 #include "src/tint/program_builder.h"
@@ -34,12 +34,12 @@ using BuiltinType = sem::BuiltinType;
 using Parameter = sem::Parameter;
 using ParameterUsage = sem::ParameterUsage;
 
-class BuiltinTableTest : public testing::Test, public ProgramBuilder {
+class IntrinsicTableTest : public testing::Test, public ProgramBuilder {
   public:
-    std::unique_ptr<BuiltinTable> table = BuiltinTable::Create(*this);
+    std::unique_ptr<IntrinsicTable> table = IntrinsicTable::Create(*this);
 };
 
-TEST_F(BuiltinTableTest, MatchF32) {
+TEST_F(IntrinsicTableTest, MatchF32) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(BuiltinType::kCos, {f32}, Source{});
     ASSERT_NE(result, nullptr) << Diagnostics().str();
@@ -50,14 +50,14 @@ TEST_F(BuiltinTableTest, MatchF32) {
     EXPECT_EQ(result->Parameters()[0]->Type(), f32);
 }
 
-TEST_F(BuiltinTableTest, MismatchF32) {
+TEST_F(IntrinsicTableTest, MismatchF32) {
     auto* i32 = create<sem::I32>();
     auto* result = table->Lookup(BuiltinType::kCos, {i32}, Source{});
     ASSERT_EQ(result, nullptr);
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchU32) {
+TEST_F(IntrinsicTableTest, MatchU32) {
     auto* f32 = create<sem::F32>();
     auto* u32 = create<sem::U32>();
     auto* vec2_f32 = create<sem::Vector>(f32, 2u);
@@ -70,14 +70,14 @@ TEST_F(BuiltinTableTest, MatchU32) {
     EXPECT_EQ(result->Parameters()[0]->Type(), u32);
 }
 
-TEST_F(BuiltinTableTest, MismatchU32) {
+TEST_F(IntrinsicTableTest, MismatchU32) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(BuiltinType::kUnpack2x16float, {f32}, Source{});
     ASSERT_EQ(result, nullptr);
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchI32) {
+TEST_F(IntrinsicTableTest, MatchI32) {
     auto* f32 = create<sem::F32>();
     auto* i32 = create<sem::I32>();
     auto* vec4_f32 = create<sem::Vector>(f32, 4u);
@@ -96,7 +96,7 @@ TEST_F(BuiltinTableTest, MatchI32) {
     EXPECT_EQ(result->Parameters()[2]->Usage(), ParameterUsage::kLevel);
 }
 
-TEST_F(BuiltinTableTest, MismatchI32) {
+TEST_F(IntrinsicTableTest, MismatchI32) {
     auto* f32 = create<sem::F32>();
     auto* tex = create<sem::SampledTexture>(ast::TextureDimension::k1d, f32);
     auto* result = table->Lookup(BuiltinType::kTextureLoad, {tex, f32}, Source{});
@@ -104,7 +104,7 @@ TEST_F(BuiltinTableTest, MismatchI32) {
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchIU32AsI32) {
+TEST_F(IntrinsicTableTest, MatchIU32AsI32) {
     auto* i32 = create<sem::I32>();
     auto* result = table->Lookup(BuiltinType::kCountOneBits, {i32}, Source{});
     ASSERT_NE(result, nullptr) << Diagnostics().str();
@@ -115,7 +115,7 @@ TEST_F(BuiltinTableTest, MatchIU32AsI32) {
     EXPECT_EQ(result->Parameters()[0]->Type(), i32);
 }
 
-TEST_F(BuiltinTableTest, MatchIU32AsU32) {
+TEST_F(IntrinsicTableTest, MatchIU32AsU32) {
     auto* u32 = create<sem::U32>();
     auto* result = table->Lookup(BuiltinType::kCountOneBits, {u32}, Source{});
     ASSERT_NE(result, nullptr) << Diagnostics().str();
@@ -126,14 +126,14 @@ TEST_F(BuiltinTableTest, MatchIU32AsU32) {
     EXPECT_EQ(result->Parameters()[0]->Type(), u32);
 }
 
-TEST_F(BuiltinTableTest, MismatchIU32) {
+TEST_F(IntrinsicTableTest, MismatchIU32) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(BuiltinType::kCountOneBits, {f32}, Source{});
     ASSERT_EQ(result, nullptr);
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchFIU32AsI32) {
+TEST_F(IntrinsicTableTest, MatchFIU32AsI32) {
     auto* i32 = create<sem::I32>();
     auto* result = table->Lookup(BuiltinType::kClamp, {i32, i32, i32}, Source{});
     ASSERT_NE(result, nullptr) << Diagnostics().str();
@@ -146,7 +146,7 @@ TEST_F(BuiltinTableTest, MatchFIU32AsI32) {
     EXPECT_EQ(result->Parameters()[2]->Type(), i32);
 }
 
-TEST_F(BuiltinTableTest, MatchFIU32AsU32) {
+TEST_F(IntrinsicTableTest, MatchFIU32AsU32) {
     auto* u32 = create<sem::U32>();
     auto* result = table->Lookup(BuiltinType::kClamp, {u32, u32, u32}, Source{});
     ASSERT_NE(result, nullptr) << Diagnostics().str();
@@ -159,7 +159,7 @@ TEST_F(BuiltinTableTest, MatchFIU32AsU32) {
     EXPECT_EQ(result->Parameters()[2]->Type(), u32);
 }
 
-TEST_F(BuiltinTableTest, MatchFIU32AsF32) {
+TEST_F(IntrinsicTableTest, MatchFIU32AsF32) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(BuiltinType::kClamp, {f32, f32, f32}, Source{});
     ASSERT_NE(result, nullptr) << Diagnostics().str();
@@ -172,14 +172,14 @@ TEST_F(BuiltinTableTest, MatchFIU32AsF32) {
     EXPECT_EQ(result->Parameters()[2]->Type(), f32);
 }
 
-TEST_F(BuiltinTableTest, MismatchFIU32) {
+TEST_F(IntrinsicTableTest, MismatchFIU32) {
     auto* bool_ = create<sem::Bool>();
     auto* result = table->Lookup(BuiltinType::kClamp, {bool_, bool_, bool_}, Source{});
     ASSERT_EQ(result, nullptr);
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchBool) {
+TEST_F(IntrinsicTableTest, MatchBool) {
     auto* f32 = create<sem::F32>();
     auto* bool_ = create<sem::Bool>();
     auto* result = table->Lookup(BuiltinType::kSelect, {f32, f32, bool_}, Source{});
@@ -193,14 +193,14 @@ TEST_F(BuiltinTableTest, MatchBool) {
     EXPECT_EQ(result->Parameters()[2]->Type(), bool_);
 }
 
-TEST_F(BuiltinTableTest, MismatchBool) {
+TEST_F(IntrinsicTableTest, MismatchBool) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(BuiltinType::kSelect, {f32, f32, f32}, Source{});
     ASSERT_EQ(result, nullptr);
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchPointer) {
+TEST_F(IntrinsicTableTest, MatchPointer) {
     auto* i32 = create<sem::I32>();
     auto* atomicI32 = create<sem::Atomic>(i32);
     auto* ptr =
@@ -214,7 +214,7 @@ TEST_F(BuiltinTableTest, MatchPointer) {
     EXPECT_EQ(result->Parameters()[0]->Type(), ptr);
 }
 
-TEST_F(BuiltinTableTest, MismatchPointer) {
+TEST_F(IntrinsicTableTest, MismatchPointer) {
     auto* i32 = create<sem::I32>();
     auto* atomicI32 = create<sem::Atomic>(i32);
     auto* result = table->Lookup(BuiltinType::kAtomicLoad, {atomicI32}, Source{});
@@ -222,7 +222,7 @@ TEST_F(BuiltinTableTest, MismatchPointer) {
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchArray) {
+TEST_F(IntrinsicTableTest, MatchArray) {
     auto* arr = create<sem::Array>(create<sem::U32>(), 0u, 4u, 4u, 4u, 4u);
     auto* arr_ptr = create<sem::Pointer>(arr, ast::StorageClass::kStorage, ast::Access::kReadWrite);
     auto* result = table->Lookup(BuiltinType::kArrayLength, {arr_ptr}, Source{});
@@ -236,14 +236,14 @@ TEST_F(BuiltinTableTest, MatchArray) {
     EXPECT_TRUE(param_type->As<sem::Pointer>()->StoreType()->Is<sem::Array>());
 }
 
-TEST_F(BuiltinTableTest, MismatchArray) {
+TEST_F(IntrinsicTableTest, MismatchArray) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(BuiltinType::kArrayLength, {f32}, Source{});
     ASSERT_EQ(result, nullptr);
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchSampler) {
+TEST_F(IntrinsicTableTest, MatchSampler) {
     auto* f32 = create<sem::F32>();
     auto* vec2_f32 = create<sem::Vector>(f32, 2u);
     auto* vec4_f32 = create<sem::Vector>(f32, 4u);
@@ -263,7 +263,7 @@ TEST_F(BuiltinTableTest, MatchSampler) {
     EXPECT_EQ(result->Parameters()[2]->Usage(), ParameterUsage::kCoords);
 }
 
-TEST_F(BuiltinTableTest, MismatchSampler) {
+TEST_F(IntrinsicTableTest, MismatchSampler) {
     auto* f32 = create<sem::F32>();
     auto* vec2_f32 = create<sem::Vector>(f32, 2u);
     auto* tex = create<sem::SampledTexture>(ast::TextureDimension::k2d, f32);
@@ -272,7 +272,7 @@ TEST_F(BuiltinTableTest, MismatchSampler) {
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchSampledTexture) {
+TEST_F(IntrinsicTableTest, MatchSampledTexture) {
     auto* i32 = create<sem::I32>();
     auto* f32 = create<sem::F32>();
     auto* vec2_i32 = create<sem::Vector>(i32, 2u);
@@ -292,7 +292,7 @@ TEST_F(BuiltinTableTest, MatchSampledTexture) {
     EXPECT_EQ(result->Parameters()[2]->Usage(), ParameterUsage::kLevel);
 }
 
-TEST_F(BuiltinTableTest, MatchMultisampledTexture) {
+TEST_F(IntrinsicTableTest, MatchMultisampledTexture) {
     auto* i32 = create<sem::I32>();
     auto* f32 = create<sem::F32>();
     auto* vec2_i32 = create<sem::Vector>(i32, 2u);
@@ -312,7 +312,7 @@ TEST_F(BuiltinTableTest, MatchMultisampledTexture) {
     EXPECT_EQ(result->Parameters()[2]->Usage(), ParameterUsage::kSampleIndex);
 }
 
-TEST_F(BuiltinTableTest, MatchDepthTexture) {
+TEST_F(IntrinsicTableTest, MatchDepthTexture) {
     auto* f32 = create<sem::F32>();
     auto* i32 = create<sem::I32>();
     auto* vec2_i32 = create<sem::Vector>(i32, 2u);
@@ -331,7 +331,7 @@ TEST_F(BuiltinTableTest, MatchDepthTexture) {
     EXPECT_EQ(result->Parameters()[2]->Usage(), ParameterUsage::kLevel);
 }
 
-TEST_F(BuiltinTableTest, MatchDepthMultisampledTexture) {
+TEST_F(IntrinsicTableTest, MatchDepthMultisampledTexture) {
     auto* f32 = create<sem::F32>();
     auto* i32 = create<sem::I32>();
     auto* vec2_i32 = create<sem::Vector>(i32, 2u);
@@ -350,7 +350,7 @@ TEST_F(BuiltinTableTest, MatchDepthMultisampledTexture) {
     EXPECT_EQ(result->Parameters()[2]->Usage(), ParameterUsage::kSampleIndex);
 }
 
-TEST_F(BuiltinTableTest, MatchExternalTexture) {
+TEST_F(IntrinsicTableTest, MatchExternalTexture) {
     auto* f32 = create<sem::F32>();
     auto* i32 = create<sem::I32>();
     auto* vec2_i32 = create<sem::Vector>(i32, 2u);
@@ -368,7 +368,7 @@ TEST_F(BuiltinTableTest, MatchExternalTexture) {
     EXPECT_EQ(result->Parameters()[1]->Usage(), ParameterUsage::kCoords);
 }
 
-TEST_F(BuiltinTableTest, MatchWOStorageTexture) {
+TEST_F(IntrinsicTableTest, MatchWOStorageTexture) {
     auto* f32 = create<sem::F32>();
     auto* i32 = create<sem::I32>();
     auto* vec2_i32 = create<sem::Vector>(i32, 2u);
@@ -391,7 +391,7 @@ TEST_F(BuiltinTableTest, MatchWOStorageTexture) {
     EXPECT_EQ(result->Parameters()[2]->Usage(), ParameterUsage::kValue);
 }
 
-TEST_F(BuiltinTableTest, MismatchTexture) {
+TEST_F(IntrinsicTableTest, MismatchTexture) {
     auto* f32 = create<sem::F32>();
     auto* i32 = create<sem::I32>();
     auto* vec2_i32 = create<sem::Vector>(i32, 2u);
@@ -400,7 +400,7 @@ TEST_F(BuiltinTableTest, MismatchTexture) {
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, ImplicitLoadOnReference) {
+TEST_F(IntrinsicTableTest, ImplicitLoadOnReference) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(
         BuiltinType::kCos,
@@ -414,7 +414,7 @@ TEST_F(BuiltinTableTest, ImplicitLoadOnReference) {
     EXPECT_EQ(result->Parameters()[0]->Type(), f32);
 }
 
-TEST_F(BuiltinTableTest, MatchOpenType) {
+TEST_F(IntrinsicTableTest, MatchOpenType) {
     auto* f32 = create<sem::F32>();
     auto* result = table->Lookup(BuiltinType::kClamp, {f32, f32, f32}, Source{});
     ASSERT_NE(result, nullptr) << Diagnostics().str();
@@ -426,7 +426,7 @@ TEST_F(BuiltinTableTest, MatchOpenType) {
     EXPECT_EQ(result->Parameters()[2]->Type(), f32);
 }
 
-TEST_F(BuiltinTableTest, MismatchOpenType) {
+TEST_F(IntrinsicTableTest, MismatchOpenType) {
     auto* f32 = create<sem::F32>();
     auto* u32 = create<sem::U32>();
     auto* result = table->Lookup(BuiltinType::kClamp, {f32, u32, f32}, Source{});
@@ -434,7 +434,7 @@ TEST_F(BuiltinTableTest, MismatchOpenType) {
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchOpenSizeVector) {
+TEST_F(IntrinsicTableTest, MatchOpenSizeVector) {
     auto* f32 = create<sem::F32>();
     auto* vec2_f32 = create<sem::Vector>(f32, 2u);
     auto* result = table->Lookup(BuiltinType::kClamp, {vec2_f32, vec2_f32, vec2_f32}, Source{});
@@ -448,7 +448,7 @@ TEST_F(BuiltinTableTest, MatchOpenSizeVector) {
     EXPECT_EQ(result->Parameters()[2]->Type(), vec2_f32);
 }
 
-TEST_F(BuiltinTableTest, MismatchOpenSizeVector) {
+TEST_F(IntrinsicTableTest, MismatchOpenSizeVector) {
     auto* f32 = create<sem::F32>();
     auto* u32 = create<sem::U32>();
     auto* vec2_f32 = create<sem::Vector>(f32, 2u);
@@ -457,7 +457,7 @@ TEST_F(BuiltinTableTest, MismatchOpenSizeVector) {
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, MatchOpenSizeMatrix) {
+TEST_F(IntrinsicTableTest, MatchOpenSizeMatrix) {
     auto* f32 = create<sem::F32>();
     auto* vec3_f32 = create<sem::Vector>(f32, 3u);
     auto* mat3_f32 = create<sem::Matrix>(vec3_f32, 3u);
@@ -470,7 +470,7 @@ TEST_F(BuiltinTableTest, MatchOpenSizeMatrix) {
     EXPECT_EQ(result->Parameters()[0]->Type(), mat3_f32);
 }
 
-TEST_F(BuiltinTableTest, MismatchOpenSizeMatrix) {
+TEST_F(IntrinsicTableTest, MismatchOpenSizeMatrix) {
     auto* f32 = create<sem::F32>();
     auto* vec2_f32 = create<sem::Vector>(f32, 2u);
     auto* mat3x2_f32 = create<sem::Matrix>(vec2_f32, 3u);
@@ -479,7 +479,7 @@ TEST_F(BuiltinTableTest, MismatchOpenSizeMatrix) {
     ASSERT_THAT(Diagnostics().str(), HasSubstr("no matching call"));
 }
 
-TEST_F(BuiltinTableTest, OverloadOrderByNumberOfParameters) {
+TEST_F(IntrinsicTableTest, OverloadOrderByNumberOfParameters) {
     // None of the arguments match, so expect the overloads with 2 parameters to
     // come first
     auto* bool_ = create<sem::Bool>();
@@ -518,7 +518,7 @@ TEST_F(BuiltinTableTest, OverloadOrderByNumberOfParameters) {
 )");
 }
 
-TEST_F(BuiltinTableTest, OverloadOrderByMatchingParameter) {
+TEST_F(IntrinsicTableTest, OverloadOrderByMatchingParameter) {
     auto* tex = create<sem::DepthTexture>(ast::TextureDimension::k2d);
     auto* bool_ = create<sem::Bool>();
     table->Lookup(BuiltinType::kTextureDimensions, {tex, bool_}, Source{});
@@ -556,7 +556,7 @@ TEST_F(BuiltinTableTest, OverloadOrderByMatchingParameter) {
 )");
 }
 
-TEST_F(BuiltinTableTest, SameOverloadReturnsSameBuiltinPointer) {
+TEST_F(IntrinsicTableTest, SameOverloadReturnsSameBuiltinPointer) {
     auto* f32 = create<sem::F32>();
     auto* vec2_f32 = create<sem::Vector>(create<sem::F32>(), 2u);
     auto* bool_ = create<sem::Bool>();
diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc
index dc1007bec2..760813d3d0 100644
--- a/src/tint/resolver/resolver.cc
+++ b/src/tint/resolver/resolver.cc
@@ -84,7 +84,7 @@ namespace tint::resolver {
 Resolver::Resolver(ProgramBuilder* builder)
     : builder_(builder),
       diagnostics_(builder->Diagnostics()),
-      builtin_table_(BuiltinTable::Create(*builder)),
+      intrinsic_table_(IntrinsicTable::Create(*builder)),
       sem_(builder, dependencies_),
       validator_(builder, sem_) {}
 
@@ -1292,7 +1292,7 @@ sem::Call* Resolver::BuiltinCall(const ast::CallExpression* expr,
                                  sem::BuiltinType builtin_type,
                                  const std::vector<const sem::Expression*> args,
                                  const std::vector<const sem::Type*> arg_tys) {
-    auto* builtin = builtin_table_->Lookup(builtin_type, std::move(arg_tys), expr->source);
+    auto* builtin = intrinsic_table_->Lookup(builtin_type, std::move(arg_tys), expr->source);
     if (!builtin) {
         return nullptr;
     }
diff --git a/src/tint/resolver/resolver.h b/src/tint/resolver/resolver.h
index f8dec1505f..ba90a30133 100644
--- a/src/tint/resolver/resolver.h
+++ b/src/tint/resolver/resolver.h
@@ -22,9 +22,9 @@
 #include <utility>
 #include <vector>
 
-#include "src/tint/builtin_table.h"
 #include "src/tint/program_builder.h"
 #include "src/tint/resolver/dependency_graph.h"
+#include "src/tint/resolver/intrinsic_table.h"
 #include "src/tint/resolver/sem_helper.h"
 #include "src/tint/resolver/validator.h"
 #include "src/tint/scope_stack.h"
@@ -378,7 +378,7 @@ class Resolver {
 
     ProgramBuilder* const builder_;
     diag::List& diagnostics_;
-    std::unique_ptr<BuiltinTable> const builtin_table_;
+    std::unique_ptr<IntrinsicTable> const intrinsic_table_;
     DependencyGraph dependencies_;
     SemHelper sem_;
     Validator validator_;
diff --git a/src/tint/sem/builtin_type.cc b/src/tint/sem/builtin_type.cc
index 820b3e60be..49ee000144 100644
--- a/src/tint/sem/builtin_type.cc
+++ b/src/tint/sem/builtin_type.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   src/tint/sem/builtin_type.cc.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/tint/sem/builtin_type.cc.tmpl b/src/tint/sem/builtin_type.cc.tmpl
index 2330c87bd9..63c20830c6 100644
--- a/src/tint/sem/builtin_type.cc.tmpl
+++ b/src/tint/sem/builtin_type.cc.tmpl
@@ -3,7 +3,7 @@
 Template file for use with tools/builtin-gen to generate builtin_type.cc
 
 See:
-* tools/cmd/builtin-gen/gen for structures used by this template
+* tools/cmd/intrinsic-gen/gen for structures used by this template
 * https://golang.org/pkg/text/template/ for documentation on the template syntax
 --------------------------------------------------------------------------------
 */ -}}
diff --git a/src/tint/sem/builtin_type.h b/src/tint/sem/builtin_type.h
index ec07274ae9..780f9c5ce7 100644
--- a/src/tint/sem/builtin_type.h
+++ b/src/tint/sem/builtin_type.h
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   src/tint/sem/builtin_type.h.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/tint/sem/builtin_type.h.tmpl b/src/tint/sem/builtin_type.h.tmpl
index b601c37ade..d4e1cc77d3 100644
--- a/src/tint/sem/builtin_type.h.tmpl
+++ b/src/tint/sem/builtin_type.h.tmpl
@@ -3,7 +3,7 @@
 Template file for use with tools/builtin-gen to generate builtin_type.h
 
 See:
-* tools/cmd/builtin-gen/gen for structures used by this template
+* tools/cmd/intrinsic-gen/gen for structures used by this template
 * https://golang.org/pkg/text/template/ for documentation on the template syntax
 --------------------------------------------------------------------------------
 */ -}}
diff --git a/src/tint/sem/parameter_usage.cc b/src/tint/sem/parameter_usage.cc
index 0eef789c38..4891bbaf0a 100644
--- a/src/tint/sem/parameter_usage.cc
+++ b/src/tint/sem/parameter_usage.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   src/tint/sem/parameter_usage.cc.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/tint/sem/parameter_usage.cc.tmpl b/src/tint/sem/parameter_usage.cc.tmpl
index bb767d428f..bc413e103a 100644
--- a/src/tint/sem/parameter_usage.cc.tmpl
+++ b/src/tint/sem/parameter_usage.cc.tmpl
@@ -3,7 +3,7 @@
 Template file for use with tools/builtin-gen to generate parameter_usage.cc
 
 See:
-* tools/cmd/builtin-gen/gen for structures used by this template
+* tools/cmd/intrinsic-gen/gen for structures used by this template
 * https://golang.org/pkg/text/template/ for documentation on the template syntax
 --------------------------------------------------------------------------------
 */ -}}
diff --git a/src/tint/sem/parameter_usage.h b/src/tint/sem/parameter_usage.h
index d4e99c1bd0..85ef64fb53 100644
--- a/src/tint/sem/parameter_usage.h
+++ b/src/tint/sem/parameter_usage.h
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   src/tint/sem/parameter_usage.h.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/tint/sem/parameter_usage.h.tmpl b/src/tint/sem/parameter_usage.h.tmpl
index f7a3c282d0..b1b5789536 100644
--- a/src/tint/sem/parameter_usage.h.tmpl
+++ b/src/tint/sem/parameter_usage.h.tmpl
@@ -3,7 +3,7 @@
 Template file for use with tools/builtin-gen to generate parameter_usage.h
 
 See:
-* tools/cmd/builtin-gen/gen for structures used by this template
+* tools/cmd/intrinsic-gen/gen for structures used by this template
 * https://golang.org/pkg/text/template/ for documentation on the template syntax
 --------------------------------------------------------------------------------
 */ -}}
diff --git a/test/tint/BUILD.gn b/test/tint/BUILD.gn
index 811127340b..bed8729b43 100644
--- a/test/tint/BUILD.gn
+++ b/test/tint/BUILD.gn
@@ -252,6 +252,7 @@ tint_unittests_source_set("tint_unittests_resolver_src") {
     "../../src/tint/resolver/function_validation_test.cc",
     "../../src/tint/resolver/host_shareable_validation_test.cc",
     "../../src/tint/resolver/increment_decrement_validation_test.cc",
+    "../../src/tint/resolver/intrinsic_table_test.cc",
     "../../src/tint/resolver/is_host_shareable_test.cc",
     "../../src/tint/resolver/is_storeable_test.cc",
     "../../src/tint/resolver/pipeline_overridable_constant_test.cc",
@@ -713,7 +714,6 @@ tint_unittests_source_set("tint_unittests_glsl_writer_src") {
 
 tint_unittests_source_set("tint_unittests_core_src") {
   sources = [
-    "../../src/tint/builtin_table_test.cc",
     "../../src/tint/castable_test.cc",
     "../../src/tint/clone_context_test.cc",
     "../../src/tint/debug_test.cc",
diff --git a/test/tint/builtins/builtins.wgsl.tmpl b/test/tint/builtins/builtins.wgsl.tmpl
index 2a3d0b2883..0edd48ebd8 100644
--- a/test/tint/builtins/builtins.wgsl.tmpl
+++ b/test/tint/builtins/builtins.wgsl.tmpl
@@ -4,7 +4,7 @@ Template file for use with tools/builtin-gen to generate the wgsl files in the
 ./gen/... subdirectories
 
 See:
-* tools/cmd/builtin-gen/gen for structures used by this template
+* tools/cmd/intrinsic-gen/gen for structures used by this template
 * https://golang.org/pkg/text/template/ for documentation on the template syntax
 --------------------------------------------------------------------------------
 */ -}}
diff --git a/test/tint/builtins/gen/abs/002533.wgsl b/test/tint/builtins/gen/abs/002533.wgsl
index bdafa50fb6..0ec97222bf 100644
--- a/test/tint/builtins/gen/abs/002533.wgsl
+++ b/test/tint/builtins/gen/abs/002533.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/005174.wgsl b/test/tint/builtins/gen/abs/005174.wgsl
index e00ef77085..1dff647955 100644
--- a/test/tint/builtins/gen/abs/005174.wgsl
+++ b/test/tint/builtins/gen/abs/005174.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl b/test/tint/builtins/gen/abs/1ce782.wgsl
index b35fe990b5..9625dec919 100644
--- a/test/tint/builtins/gen/abs/1ce782.wgsl
+++ b/test/tint/builtins/gen/abs/1ce782.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl b/test/tint/builtins/gen/abs/1e9d53.wgsl
index 96f14f46ea..9ad99cd24d 100644
--- a/test/tint/builtins/gen/abs/1e9d53.wgsl
+++ b/test/tint/builtins/gen/abs/1e9d53.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl b/test/tint/builtins/gen/abs/467cd1.wgsl
index 71492abc98..888fbb10c9 100644
--- a/test/tint/builtins/gen/abs/467cd1.wgsl
+++ b/test/tint/builtins/gen/abs/467cd1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl b/test/tint/builtins/gen/abs/4ad288.wgsl
index f2824a7333..62af62aa40 100644
--- a/test/tint/builtins/gen/abs/4ad288.wgsl
+++ b/test/tint/builtins/gen/abs/4ad288.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl b/test/tint/builtins/gen/abs/5ad50a.wgsl
index 59be6337b4..5344a49451 100644
--- a/test/tint/builtins/gen/abs/5ad50a.wgsl
+++ b/test/tint/builtins/gen/abs/5ad50a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/7326de.wgsl b/test/tint/builtins/gen/abs/7326de.wgsl
index cc548744ac..860ec8adc5 100644
--- a/test/tint/builtins/gen/abs/7326de.wgsl
+++ b/test/tint/builtins/gen/abs/7326de.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl b/test/tint/builtins/gen/abs/7f28e6.wgsl
index 3bf83f33ff..af3bf446d7 100644
--- a/test/tint/builtins/gen/abs/7f28e6.wgsl
+++ b/test/tint/builtins/gen/abs/7f28e6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl b/test/tint/builtins/gen/abs/7faa9e.wgsl
index 118296e1e3..b88f802b70 100644
--- a/test/tint/builtins/gen/abs/7faa9e.wgsl
+++ b/test/tint/builtins/gen/abs/7faa9e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl b/test/tint/builtins/gen/abs/9c80a6.wgsl
index 6697bce8aa..7a66ed0ed7 100644
--- a/test/tint/builtins/gen/abs/9c80a6.wgsl
+++ b/test/tint/builtins/gen/abs/9c80a6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/abs/b96037.wgsl b/test/tint/builtins/gen/abs/b96037.wgsl
index 16d7aca40c..36b06a4482 100644
--- a/test/tint/builtins/gen/abs/b96037.wgsl
+++ b/test/tint/builtins/gen/abs/b96037.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/acos/489247.wgsl b/test/tint/builtins/gen/acos/489247.wgsl
index 6807f42c0a..d43d0440a6 100644
--- a/test/tint/builtins/gen/acos/489247.wgsl
+++ b/test/tint/builtins/gen/acos/489247.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl b/test/tint/builtins/gen/acos/8e2acf.wgsl
index cd8ec5f58b..d4f40c64ac 100644
--- a/test/tint/builtins/gen/acos/8e2acf.wgsl
+++ b/test/tint/builtins/gen/acos/8e2acf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl b/test/tint/builtins/gen/acos/a610c4.wgsl
index 417d5bed37..32ec90b1ab 100644
--- a/test/tint/builtins/gen/acos/a610c4.wgsl
+++ b/test/tint/builtins/gen/acos/a610c4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl b/test/tint/builtins/gen/acos/dfc915.wgsl
index 9e93bf59a5..f1313be17e 100644
--- a/test/tint/builtins/gen/acos/dfc915.wgsl
+++ b/test/tint/builtins/gen/acos/dfc915.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/all/353d6a.wgsl b/test/tint/builtins/gen/all/353d6a.wgsl
index ca4d3ae6b0..11e9479382 100644
--- a/test/tint/builtins/gen/all/353d6a.wgsl
+++ b/test/tint/builtins/gen/all/353d6a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/all/986c7b.wgsl b/test/tint/builtins/gen/all/986c7b.wgsl
index f135a9f604..5e3d3c42fd 100644
--- a/test/tint/builtins/gen/all/986c7b.wgsl
+++ b/test/tint/builtins/gen/all/986c7b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl b/test/tint/builtins/gen/all/bd2dba.wgsl
index 16c6ac6b93..7b98f0de9f 100644
--- a/test/tint/builtins/gen/all/bd2dba.wgsl
+++ b/test/tint/builtins/gen/all/bd2dba.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/all/f46790.wgsl b/test/tint/builtins/gen/all/f46790.wgsl
index aaf9f06dba..6e5b3eae97 100644
--- a/test/tint/builtins/gen/all/f46790.wgsl
+++ b/test/tint/builtins/gen/all/f46790.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/any/083428.wgsl b/test/tint/builtins/gen/any/083428.wgsl
index 6eb6b27922..d360268c95 100644
--- a/test/tint/builtins/gen/any/083428.wgsl
+++ b/test/tint/builtins/gen/any/083428.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl b/test/tint/builtins/gen/any/0e3e58.wgsl
index e8a9c40cac..a2d13f58cf 100644
--- a/test/tint/builtins/gen/any/0e3e58.wgsl
+++ b/test/tint/builtins/gen/any/0e3e58.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl b/test/tint/builtins/gen/any/2ab91a.wgsl
index 7a826f9396..c02781c3b8 100644
--- a/test/tint/builtins/gen/any/2ab91a.wgsl
+++ b/test/tint/builtins/gen/any/2ab91a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/any/e755c1.wgsl b/test/tint/builtins/gen/any/e755c1.wgsl
index 5808fda6d8..342c9d2643 100644
--- a/test/tint/builtins/gen/any/e755c1.wgsl
+++ b/test/tint/builtins/gen/any/e755c1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl b/test/tint/builtins/gen/arrayLength/1588cd.wgsl
index 6f49b0f793..02b63c6ffa 100644
--- a/test/tint/builtins/gen/arrayLength/1588cd.wgsl
+++ b/test/tint/builtins/gen/arrayLength/1588cd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl b/test/tint/builtins/gen/arrayLength/61b1c7.wgsl
index dafd6e12dc..195f911845 100644
--- a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl
+++ b/test/tint/builtins/gen/arrayLength/61b1c7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl b/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
index 0d0b18e636..a9ae5dc509 100644
--- a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
+++ b/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl b/test/tint/builtins/gen/arrayLength/cdd123.wgsl
index c560fd9b6c..fae8c7f4cf 100644
--- a/test/tint/builtins/gen/arrayLength/cdd123.wgsl
+++ b/test/tint/builtins/gen/arrayLength/cdd123.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl b/test/tint/builtins/gen/arrayLength/cfca0a.wgsl
index 5a488c555a..afebc263e3 100644
--- a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl
+++ b/test/tint/builtins/gen/arrayLength/cfca0a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl b/test/tint/builtins/gen/arrayLength/eb510f.wgsl
index 072a29d9c6..f9d0163437 100644
--- a/test/tint/builtins/gen/arrayLength/eb510f.wgsl
+++ b/test/tint/builtins/gen/arrayLength/eb510f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/asin/064953.wgsl b/test/tint/builtins/gen/asin/064953.wgsl
index 2051a83e14..e26ebf28f1 100644
--- a/test/tint/builtins/gen/asin/064953.wgsl
+++ b/test/tint/builtins/gen/asin/064953.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl b/test/tint/builtins/gen/asin/7b6a44.wgsl
index de1b8a03a3..57b4c94d92 100644
--- a/test/tint/builtins/gen/asin/7b6a44.wgsl
+++ b/test/tint/builtins/gen/asin/7b6a44.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl b/test/tint/builtins/gen/asin/8cd9c9.wgsl
index c487d6e1ba..5406bd961d 100644
--- a/test/tint/builtins/gen/asin/8cd9c9.wgsl
+++ b/test/tint/builtins/gen/asin/8cd9c9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl b/test/tint/builtins/gen/asin/c0c272.wgsl
index 2b2846dcb6..339c53fcd9 100644
--- a/test/tint/builtins/gen/asin/c0c272.wgsl
+++ b/test/tint/builtins/gen/asin/c0c272.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan/02979a.wgsl b/test/tint/builtins/gen/atan/02979a.wgsl
index 0404f6d43b..99fc24b64f 100644
--- a/test/tint/builtins/gen/atan/02979a.wgsl
+++ b/test/tint/builtins/gen/atan/02979a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl b/test/tint/builtins/gen/atan/331e6d.wgsl
index f1227b9270..e3f4989b9a 100644
--- a/test/tint/builtins/gen/atan/331e6d.wgsl
+++ b/test/tint/builtins/gen/atan/331e6d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl b/test/tint/builtins/gen/atan/a8b696.wgsl
index 6140bd4d09..2eea8423af 100644
--- a/test/tint/builtins/gen/atan/a8b696.wgsl
+++ b/test/tint/builtins/gen/atan/a8b696.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl b/test/tint/builtins/gen/atan/ad96e4.wgsl
index c1962a3f91..170c7fc41a 100644
--- a/test/tint/builtins/gen/atan/ad96e4.wgsl
+++ b/test/tint/builtins/gen/atan/ad96e4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl b/test/tint/builtins/gen/atan2/57fb13.wgsl
index b0dcf5b42c..be99214c3e 100644
--- a/test/tint/builtins/gen/atan2/57fb13.wgsl
+++ b/test/tint/builtins/gen/atan2/57fb13.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl b/test/tint/builtins/gen/atan2/96057c.wgsl
index fdb568d0f1..dad1ef2553 100644
--- a/test/tint/builtins/gen/atan2/96057c.wgsl
+++ b/test/tint/builtins/gen/atan2/96057c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl b/test/tint/builtins/gen/atan2/a70d0d.wgsl
index 32606c569a..26af2e66ee 100644
--- a/test/tint/builtins/gen/atan2/a70d0d.wgsl
+++ b/test/tint/builtins/gen/atan2/a70d0d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl b/test/tint/builtins/gen/atan2/ae713e.wgsl
index 04c90a56cc..63a6442c9e 100644
--- a/test/tint/builtins/gen/atan2/ae713e.wgsl
+++ b/test/tint/builtins/gen/atan2/ae713e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl b/test/tint/builtins/gen/atomicAdd/794055.wgsl
index 7dc9f159dc..6c60c665b9 100644
--- a/test/tint/builtins/gen/atomicAdd/794055.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/794055.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl b/test/tint/builtins/gen/atomicAdd/8a199a.wgsl
index d97c7669ef..af301b7e92 100644
--- a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/8a199a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl b/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
index a38605b0e2..23fd6a4ede 100644
--- a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl b/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
index 2b898a3f6d..ba04b1a14a 100644
--- a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl b/test/tint/builtins/gen/atomicAnd/152966.wgsl
index 0387cef384..fa2fee45cd 100644
--- a/test/tint/builtins/gen/atomicAnd/152966.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/152966.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl b/test/tint/builtins/gen/atomicAnd/34edd3.wgsl
index acfcca1c31..18f2a0cde3 100644
--- a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/34edd3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl b/test/tint/builtins/gen/atomicAnd/45a819.wgsl
index 59730cedb3..2eedbaf125 100644
--- a/test/tint/builtins/gen/atomicAnd/45a819.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/45a819.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl b/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
index ea064e39ff..b4027bd9bc 100644
--- a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl
index 4522f72136..1f1c2d1e47 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl
index 76ba8f21d0..d4473253e9 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl
index b36f366baa..c81fc384cd 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl
index 755b539b36..d75b725e85 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl b/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
index f224317780..092c5ac3b2 100644
--- a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl b/test/tint/builtins/gen/atomicExchange/d59712.wgsl
index f825937e4e..2aa8b8b58f 100644
--- a/test/tint/builtins/gen/atomicExchange/d59712.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/d59712.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl b/test/tint/builtins/gen/atomicExchange/e114ba.wgsl
index 8a72838508..3fc0b8f7a8 100644
--- a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/e114ba.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl b/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
index d4763b8e79..566f56382b 100644
--- a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl b/test/tint/builtins/gen/atomicLoad/0806ad.wgsl
index 19631ca16b..9fc9f60996 100644
--- a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/0806ad.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl b/test/tint/builtins/gen/atomicLoad/361bf1.wgsl
index bc93e526f1..99e9c04932 100644
--- a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/361bf1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl b/test/tint/builtins/gen/atomicLoad/afcc03.wgsl
index f20d63ad71..935ab5fe45 100644
--- a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/afcc03.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl b/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
index 2f0409ba50..e1e256a20d 100644
--- a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl b/test/tint/builtins/gen/atomicMax/51b9be.wgsl
index 2a86b17939..43a6f6cd99 100644
--- a/test/tint/builtins/gen/atomicMax/51b9be.wgsl
+++ b/test/tint/builtins/gen/atomicMax/51b9be.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl b/test/tint/builtins/gen/atomicMax/92aa72.wgsl
index f3758d73fa..7336d647fc 100644
--- a/test/tint/builtins/gen/atomicMax/92aa72.wgsl
+++ b/test/tint/builtins/gen/atomicMax/92aa72.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl b/test/tint/builtins/gen/atomicMax/a89cc3.wgsl
index 549d4ed0f5..beea1a7e35 100644
--- a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl
+++ b/test/tint/builtins/gen/atomicMax/a89cc3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl b/test/tint/builtins/gen/atomicMax/beccfc.wgsl
index e72c315d96..452b30788c 100644
--- a/test/tint/builtins/gen/atomicMax/beccfc.wgsl
+++ b/test/tint/builtins/gen/atomicMax/beccfc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl b/test/tint/builtins/gen/atomicMin/278235.wgsl
index 4ed90a6978..ff8a7cf72c 100644
--- a/test/tint/builtins/gen/atomicMin/278235.wgsl
+++ b/test/tint/builtins/gen/atomicMin/278235.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl b/test/tint/builtins/gen/atomicMin/69d383.wgsl
index 7c161a2606..f4f70b13b3 100644
--- a/test/tint/builtins/gen/atomicMin/69d383.wgsl
+++ b/test/tint/builtins/gen/atomicMin/69d383.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl b/test/tint/builtins/gen/atomicMin/8e38dc.wgsl
index 173b32dac2..484f709f43 100644
--- a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl
+++ b/test/tint/builtins/gen/atomicMin/8e38dc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl b/test/tint/builtins/gen/atomicMin/c67a74.wgsl
index f9f3a09401..cf8986bdf7 100644
--- a/test/tint/builtins/gen/atomicMin/c67a74.wgsl
+++ b/test/tint/builtins/gen/atomicMin/c67a74.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl b/test/tint/builtins/gen/atomicOr/5e3d61.wgsl
index 346ba96c16..9520869ea0 100644
--- a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl
+++ b/test/tint/builtins/gen/atomicOr/5e3d61.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl b/test/tint/builtins/gen/atomicOr/5e95d4.wgsl
index c06171dc04..d35f50242f 100644
--- a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl
+++ b/test/tint/builtins/gen/atomicOr/5e95d4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl b/test/tint/builtins/gen/atomicOr/8d96a0.wgsl
index 1a3b37b486..901470f1b8 100644
--- a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl
+++ b/test/tint/builtins/gen/atomicOr/8d96a0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl b/test/tint/builtins/gen/atomicOr/d09248.wgsl
index 04799d3ebf..da2bd7981e 100644
--- a/test/tint/builtins/gen/atomicOr/d09248.wgsl
+++ b/test/tint/builtins/gen/atomicOr/d09248.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl b/test/tint/builtins/gen/atomicStore/726882.wgsl
index 2e06a11cfe..4ee9d6f2f8 100644
--- a/test/tint/builtins/gen/atomicStore/726882.wgsl
+++ b/test/tint/builtins/gen/atomicStore/726882.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl b/test/tint/builtins/gen/atomicStore/8bea94.wgsl
index adf6bc8f06..c22ea05545 100644
--- a/test/tint/builtins/gen/atomicStore/8bea94.wgsl
+++ b/test/tint/builtins/gen/atomicStore/8bea94.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl b/test/tint/builtins/gen/atomicStore/cdc29e.wgsl
index e6815d2b99..ef3c49ca68 100644
--- a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl
+++ b/test/tint/builtins/gen/atomicStore/cdc29e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl b/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
index a0c8c44a63..ea7559df92 100644
--- a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
+++ b/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl b/test/tint/builtins/gen/atomicSub/051100.wgsl
index a76408a0b5..6b84ec19b1 100644
--- a/test/tint/builtins/gen/atomicSub/051100.wgsl
+++ b/test/tint/builtins/gen/atomicSub/051100.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl b/test/tint/builtins/gen/atomicSub/0d26c2.wgsl
index 90b69e436f..9617c0ae61 100644
--- a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl
+++ b/test/tint/builtins/gen/atomicSub/0d26c2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl b/test/tint/builtins/gen/atomicSub/15bfc9.wgsl
index 705b85ba5a..c7f190a830 100644
--- a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl
+++ b/test/tint/builtins/gen/atomicSub/15bfc9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl b/test/tint/builtins/gen/atomicSub/77883a.wgsl
index d9ee7f7a16..fbd20fc094 100644
--- a/test/tint/builtins/gen/atomicSub/77883a.wgsl
+++ b/test/tint/builtins/gen/atomicSub/77883a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl b/test/tint/builtins/gen/atomicXor/54510e.wgsl
index c7fae2d813..86e9648009 100644
--- a/test/tint/builtins/gen/atomicXor/54510e.wgsl
+++ b/test/tint/builtins/gen/atomicXor/54510e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl b/test/tint/builtins/gen/atomicXor/75dc95.wgsl
index b7efd78e01..3676e85bf5 100644
--- a/test/tint/builtins/gen/atomicXor/75dc95.wgsl
+++ b/test/tint/builtins/gen/atomicXor/75dc95.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl b/test/tint/builtins/gen/atomicXor/c1b78c.wgsl
index 68694e397a..9842ed4daa 100644
--- a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl
+++ b/test/tint/builtins/gen/atomicXor/c1b78c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl b/test/tint/builtins/gen/atomicXor/c8e6be.wgsl
index 2457d46611..3307d26add 100644
--- a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl
+++ b/test/tint/builtins/gen/atomicXor/c8e6be.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl b/test/tint/builtins/gen/ceil/34064b.wgsl
index 5cd3cccf62..1445063bb6 100644
--- a/test/tint/builtins/gen/ceil/34064b.wgsl
+++ b/test/tint/builtins/gen/ceil/34064b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ceil/678655.wgsl b/test/tint/builtins/gen/ceil/678655.wgsl
index d09fe2ca5b..d749c91f69 100644
--- a/test/tint/builtins/gen/ceil/678655.wgsl
+++ b/test/tint/builtins/gen/ceil/678655.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl b/test/tint/builtins/gen/ceil/96f597.wgsl
index 10cf5abb46..9d9a2f08a6 100644
--- a/test/tint/builtins/gen/ceil/96f597.wgsl
+++ b/test/tint/builtins/gen/ceil/96f597.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl b/test/tint/builtins/gen/ceil/b74c16.wgsl
index 229e58ee64..ea41b22748 100644
--- a/test/tint/builtins/gen/ceil/b74c16.wgsl
+++ b/test/tint/builtins/gen/ceil/b74c16.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl b/test/tint/builtins/gen/clamp/0acf8f.wgsl
index 31b7207843..0650d845cd 100644
--- a/test/tint/builtins/gen/clamp/0acf8f.wgsl
+++ b/test/tint/builtins/gen/clamp/0acf8f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl b/test/tint/builtins/gen/clamp/1a32e3.wgsl
index b2450e557b..491e906f67 100644
--- a/test/tint/builtins/gen/clamp/1a32e3.wgsl
+++ b/test/tint/builtins/gen/clamp/1a32e3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl b/test/tint/builtins/gen/clamp/2bd567.wgsl
index 7858c5a2db..51804e2c29 100644
--- a/test/tint/builtins/gen/clamp/2bd567.wgsl
+++ b/test/tint/builtins/gen/clamp/2bd567.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl b/test/tint/builtins/gen/clamp/2bde41.wgsl
index ba46736b0a..9c7f458750 100644
--- a/test/tint/builtins/gen/clamp/2bde41.wgsl
+++ b/test/tint/builtins/gen/clamp/2bde41.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl b/test/tint/builtins/gen/clamp/548fc7.wgsl
index 81e18829fd..7465eaaef4 100644
--- a/test/tint/builtins/gen/clamp/548fc7.wgsl
+++ b/test/tint/builtins/gen/clamp/548fc7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl b/test/tint/builtins/gen/clamp/5f0819.wgsl
index 6c211d3083..09a03f729c 100644
--- a/test/tint/builtins/gen/clamp/5f0819.wgsl
+++ b/test/tint/builtins/gen/clamp/5f0819.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl b/test/tint/builtins/gen/clamp/6c1749.wgsl
index b27362cb7b..71a22c76e9 100644
--- a/test/tint/builtins/gen/clamp/6c1749.wgsl
+++ b/test/tint/builtins/gen/clamp/6c1749.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl b/test/tint/builtins/gen/clamp/7706d7.wgsl
index 587ba3d3fc..04c333b4af 100644
--- a/test/tint/builtins/gen/clamp/7706d7.wgsl
+++ b/test/tint/builtins/gen/clamp/7706d7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/867397.wgsl b/test/tint/builtins/gen/clamp/867397.wgsl
index 9a48f1d2c8..328951dfba 100644
--- a/test/tint/builtins/gen/clamp/867397.wgsl
+++ b/test/tint/builtins/gen/clamp/867397.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl b/test/tint/builtins/gen/clamp/a2de25.wgsl
index 4d613781de..ffec765d92 100644
--- a/test/tint/builtins/gen/clamp/a2de25.wgsl
+++ b/test/tint/builtins/gen/clamp/a2de25.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl b/test/tint/builtins/gen/clamp/b07c65.wgsl
index 7fbfccf4cd..057b56e17d 100644
--- a/test/tint/builtins/gen/clamp/b07c65.wgsl
+++ b/test/tint/builtins/gen/clamp/b07c65.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl b/test/tint/builtins/gen/clamp/bd43ce.wgsl
index 55d2efe931..bf1e316d32 100644
--- a/test/tint/builtins/gen/clamp/bd43ce.wgsl
+++ b/test/tint/builtins/gen/clamp/bd43ce.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl b/test/tint/builtins/gen/cos/16dc15.wgsl
index 6d7f97daf1..021e5c440e 100644
--- a/test/tint/builtins/gen/cos/16dc15.wgsl
+++ b/test/tint/builtins/gen/cos/16dc15.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl b/test/tint/builtins/gen/cos/29d66d.wgsl
index d3c4d96a6e..0c13e978da 100644
--- a/test/tint/builtins/gen/cos/29d66d.wgsl
+++ b/test/tint/builtins/gen/cos/29d66d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl b/test/tint/builtins/gen/cos/c3b486.wgsl
index b96d9d5696..47e96863ef 100644
--- a/test/tint/builtins/gen/cos/c3b486.wgsl
+++ b/test/tint/builtins/gen/cos/c3b486.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl b/test/tint/builtins/gen/cos/c5c28e.wgsl
index 735be07681..a23fe4d5ac 100644
--- a/test/tint/builtins/gen/cos/c5c28e.wgsl
+++ b/test/tint/builtins/gen/cos/c5c28e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cosh/377652.wgsl b/test/tint/builtins/gen/cosh/377652.wgsl
index 25ca8eba8a..0ad3390a3d 100644
--- a/test/tint/builtins/gen/cosh/377652.wgsl
+++ b/test/tint/builtins/gen/cosh/377652.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl b/test/tint/builtins/gen/cosh/c13756.wgsl
index ef0504509c..4f3a5f33e7 100644
--- a/test/tint/builtins/gen/cosh/c13756.wgsl
+++ b/test/tint/builtins/gen/cosh/c13756.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl b/test/tint/builtins/gen/cosh/da92dd.wgsl
index 029d87dbd8..a109d8db3d 100644
--- a/test/tint/builtins/gen/cosh/da92dd.wgsl
+++ b/test/tint/builtins/gen/cosh/da92dd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl b/test/tint/builtins/gen/cosh/e0c1de.wgsl
index 9bc0f11f4f..36fd554ebf 100644
--- a/test/tint/builtins/gen/cosh/e0c1de.wgsl
+++ b/test/tint/builtins/gen/cosh/e0c1de.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl b/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl
index ebae1b9367..fe5e75b1e0 100644
--- a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl b/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl
index 9aa81132fa..7eb079db8b 100644
--- a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl b/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl
index 0cc8a08a2a..548e9eb197 100644
--- a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl b/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl
index 49ac83c5eb..3b78cb8860 100644
--- a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl b/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl
index a45bad1603..572c079326 100644
--- a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl b/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl
index 5978277afd..e5563bde1b 100644
--- a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl b/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl
index 3f8861d711..63d3fb100e 100644
--- a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl b/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl
index f86d224133..223906e77e 100644
--- a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl
+++ b/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl b/test/tint/builtins/gen/countOneBits/0d0e46.wgsl
index b9bcc99626..611d80f2a1 100644
--- a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl
+++ b/test/tint/builtins/gen/countOneBits/0d0e46.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl b/test/tint/builtins/gen/countOneBits/0f7980.wgsl
index 035d33864a..3073ef7281 100644
--- a/test/tint/builtins/gen/countOneBits/0f7980.wgsl
+++ b/test/tint/builtins/gen/countOneBits/0f7980.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl b/test/tint/builtins/gen/countOneBits/65d2ae.wgsl
index 7d21d1bc7f..1a5a546512 100644
--- a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl
+++ b/test/tint/builtins/gen/countOneBits/65d2ae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl b/test/tint/builtins/gen/countOneBits/690cfc.wgsl
index 0b81a72167..b867e47513 100644
--- a/test/tint/builtins/gen/countOneBits/690cfc.wgsl
+++ b/test/tint/builtins/gen/countOneBits/690cfc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl b/test/tint/builtins/gen/countOneBits/94fd81.wgsl
index b2c90a7280..e47075b133 100644
--- a/test/tint/builtins/gen/countOneBits/94fd81.wgsl
+++ b/test/tint/builtins/gen/countOneBits/94fd81.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl b/test/tint/builtins/gen/countOneBits/ae44f9.wgsl
index 214e9a0241..72fcca7a3b 100644
--- a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl
+++ b/test/tint/builtins/gen/countOneBits/ae44f9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl b/test/tint/builtins/gen/countOneBits/af90e2.wgsl
index 73881b55ff..29c605d7b1 100644
--- a/test/tint/builtins/gen/countOneBits/af90e2.wgsl
+++ b/test/tint/builtins/gen/countOneBits/af90e2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl b/test/tint/builtins/gen/countOneBits/fd88b2.wgsl
index 2aa57cb960..9e2785961a 100644
--- a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl
+++ b/test/tint/builtins/gen/countOneBits/fd88b2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl b/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl
index 2c4eba126e..c5a085301f 100644
--- a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl b/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl
index a2a9bb8eae..1d30317f5b 100644
--- a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl b/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl
index 16b9a453d2..e2666714ca 100644
--- a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl b/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl
index 6483038d84..2aca57f61a 100644
--- a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl b/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl
index 4eb07d08de..6006270964 100644
--- a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl b/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl
index 1ca199dd4f..967f8007fa 100644
--- a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl b/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl
index 6325e9dd12..3ba9cdeadb 100644
--- a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl b/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl
index 7d35d261c8..71eb20dda5 100644
--- a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl
+++ b/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl b/test/tint/builtins/gen/cross/041cb0.wgsl
index e328d7a209..91dc4dd1cd 100644
--- a/test/tint/builtins/gen/cross/041cb0.wgsl
+++ b/test/tint/builtins/gen/cross/041cb0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl b/test/tint/builtins/gen/degrees/0d170c.wgsl
index acb37d1ecb..ea8d9b0eac 100644
--- a/test/tint/builtins/gen/degrees/0d170c.wgsl
+++ b/test/tint/builtins/gen/degrees/0d170c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl b/test/tint/builtins/gen/degrees/1ad5df.wgsl
index e28327c24b..5aefd49f09 100644
--- a/test/tint/builtins/gen/degrees/1ad5df.wgsl
+++ b/test/tint/builtins/gen/degrees/1ad5df.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl b/test/tint/builtins/gen/degrees/2af623.wgsl
index 06fae0b49c..a348fb1d59 100644
--- a/test/tint/builtins/gen/degrees/2af623.wgsl
+++ b/test/tint/builtins/gen/degrees/2af623.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl b/test/tint/builtins/gen/degrees/51f705.wgsl
index 25a905fb35..54b7f32da7 100644
--- a/test/tint/builtins/gen/degrees/51f705.wgsl
+++ b/test/tint/builtins/gen/degrees/51f705.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl b/test/tint/builtins/gen/determinant/2b62ba.wgsl
index 843d2fd1b0..c409909e61 100644
--- a/test/tint/builtins/gen/determinant/2b62ba.wgsl
+++ b/test/tint/builtins/gen/determinant/2b62ba.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl b/test/tint/builtins/gen/determinant/a0a87c.wgsl
index 07acc02c84..e247511828 100644
--- a/test/tint/builtins/gen/determinant/a0a87c.wgsl
+++ b/test/tint/builtins/gen/determinant/a0a87c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl b/test/tint/builtins/gen/determinant/e19305.wgsl
index a9fbdf38fc..65866818ae 100644
--- a/test/tint/builtins/gen/determinant/e19305.wgsl
+++ b/test/tint/builtins/gen/determinant/e19305.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl b/test/tint/builtins/gen/distance/0657d4.wgsl
index e23b25d8eb..760f0038f2 100644
--- a/test/tint/builtins/gen/distance/0657d4.wgsl
+++ b/test/tint/builtins/gen/distance/0657d4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl b/test/tint/builtins/gen/distance/9646ea.wgsl
index 0d9fcf9f1c..d4ff160ee3 100644
--- a/test/tint/builtins/gen/distance/9646ea.wgsl
+++ b/test/tint/builtins/gen/distance/9646ea.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl b/test/tint/builtins/gen/distance/aa4055.wgsl
index c6707c6ebc..742f5766ba 100644
--- a/test/tint/builtins/gen/distance/aa4055.wgsl
+++ b/test/tint/builtins/gen/distance/aa4055.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl b/test/tint/builtins/gen/distance/cfed73.wgsl
index 072a5a388f..ab06206079 100644
--- a/test/tint/builtins/gen/distance/cfed73.wgsl
+++ b/test/tint/builtins/gen/distance/cfed73.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl b/test/tint/builtins/gen/dot/0c577b.wgsl
index 31880ee55f..4580e0ddf3 100644
--- a/test/tint/builtins/gen/dot/0c577b.wgsl
+++ b/test/tint/builtins/gen/dot/0c577b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl b/test/tint/builtins/gen/dot/7548a0.wgsl
index 4ec257b182..2b0fccf76f 100644
--- a/test/tint/builtins/gen/dot/7548a0.wgsl
+++ b/test/tint/builtins/gen/dot/7548a0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl b/test/tint/builtins/gen/dot/883f0e.wgsl
index e4fa57ff04..06618c1083 100644
--- a/test/tint/builtins/gen/dot/883f0e.wgsl
+++ b/test/tint/builtins/gen/dot/883f0e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl b/test/tint/builtins/gen/dot/97c7ee.wgsl
index cd625a5142..d2dc8a4b7a 100644
--- a/test/tint/builtins/gen/dot/97c7ee.wgsl
+++ b/test/tint/builtins/gen/dot/97c7ee.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl b/test/tint/builtins/gen/dot/ba4246.wgsl
index 65c37bcc75..867556a357 100644
--- a/test/tint/builtins/gen/dot/ba4246.wgsl
+++ b/test/tint/builtins/gen/dot/ba4246.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl b/test/tint/builtins/gen/dot/e994c7.wgsl
index 276d319ee0..02ce1d0e98 100644
--- a/test/tint/builtins/gen/dot/e994c7.wgsl
+++ b/test/tint/builtins/gen/dot/e994c7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl b/test/tint/builtins/gen/dot/ef6b1d.wgsl
index 12a14131f3..be5a79e25f 100644
--- a/test/tint/builtins/gen/dot/ef6b1d.wgsl
+++ b/test/tint/builtins/gen/dot/ef6b1d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl b/test/tint/builtins/gen/dot/f1312c.wgsl
index d927a0b8bf..32e1075e0d 100644
--- a/test/tint/builtins/gen/dot/f1312c.wgsl
+++ b/test/tint/builtins/gen/dot/f1312c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl b/test/tint/builtins/gen/dot/fc5f7c.wgsl
index 266ffefb08..5cd141daea 100644
--- a/test/tint/builtins/gen/dot/fc5f7c.wgsl
+++ b/test/tint/builtins/gen/dot/fc5f7c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl b/test/tint/builtins/gen/dpdx/0763f7.wgsl
index 7d10a9f800..8c44f2a8e9 100644
--- a/test/tint/builtins/gen/dpdx/0763f7.wgsl
+++ b/test/tint/builtins/gen/dpdx/0763f7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl b/test/tint/builtins/gen/dpdx/99edb1.wgsl
index 2d9088fea7..3231b03f96 100644
--- a/test/tint/builtins/gen/dpdx/99edb1.wgsl
+++ b/test/tint/builtins/gen/dpdx/99edb1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl b/test/tint/builtins/gen/dpdx/c487fa.wgsl
index 6ab9184edc..857bad4ce8 100644
--- a/test/tint/builtins/gen/dpdx/c487fa.wgsl
+++ b/test/tint/builtins/gen/dpdx/c487fa.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl b/test/tint/builtins/gen/dpdx/e263de.wgsl
index 1d82da598d..a95caa7ff8 100644
--- a/test/tint/builtins/gen/dpdx/e263de.wgsl
+++ b/test/tint/builtins/gen/dpdx/e263de.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl b/test/tint/builtins/gen/dpdxCoarse/029152.wgsl
index 4a531d625d..86d126d404 100644
--- a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/029152.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl b/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
index a7277e6db8..54dd7e45e4 100644
--- a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl b/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
index 1d63a075b7..20ae7bfafe 100644
--- a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl b/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
index 9919283f24..81681e566c 100644
--- a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl b/test/tint/builtins/gen/dpdxFine/8c5069.wgsl
index ca1b3ccd91..1b4274d8dc 100644
--- a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/8c5069.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl b/test/tint/builtins/gen/dpdxFine/9631de.wgsl
index a51878e855..847a81cf3b 100644
--- a/test/tint/builtins/gen/dpdxFine/9631de.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/9631de.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl b/test/tint/builtins/gen/dpdxFine/f401a2.wgsl
index 2a688e32e4..de0a8b28f5 100644
--- a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/f401a2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl b/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
index c8e8ce0dc6..85f9d43e62 100644
--- a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl b/test/tint/builtins/gen/dpdy/699a05.wgsl
index b82a4b04a7..b2255a01e7 100644
--- a/test/tint/builtins/gen/dpdy/699a05.wgsl
+++ b/test/tint/builtins/gen/dpdy/699a05.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl b/test/tint/builtins/gen/dpdy/7f8d84.wgsl
index e53e29413e..00fe00e435 100644
--- a/test/tint/builtins/gen/dpdy/7f8d84.wgsl
+++ b/test/tint/builtins/gen/dpdy/7f8d84.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl b/test/tint/builtins/gen/dpdy/a8b56e.wgsl
index 6952e04283..e9fe4e6166 100644
--- a/test/tint/builtins/gen/dpdy/a8b56e.wgsl
+++ b/test/tint/builtins/gen/dpdy/a8b56e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl b/test/tint/builtins/gen/dpdy/feb40f.wgsl
index 6e50d7cdd7..6e5626557d 100644
--- a/test/tint/builtins/gen/dpdy/feb40f.wgsl
+++ b/test/tint/builtins/gen/dpdy/feb40f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl b/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
index 7d6c58c186..e29e79462f 100644
--- a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl b/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
index 8c3197d1a3..8f4045d88d 100644
--- a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl b/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
index 96addfab77..ec41cef77c 100644
--- a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl b/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
index a69bf6389f..ac3ea31393 100644
--- a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl b/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
index c316f63aa3..fd7c18c267 100644
--- a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl b/test/tint/builtins/gen/dpdyFine/6eb673.wgsl
index dc7a60c59a..2477a40ea3 100644
--- a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/6eb673.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl b/test/tint/builtins/gen/dpdyFine/d0a648.wgsl
index d1b444c5e5..7bc1312364 100644
--- a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/d0a648.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl b/test/tint/builtins/gen/dpdyFine/df33aa.wgsl
index 2d6985d85e..0a10ff414e 100644
--- a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/df33aa.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl b/test/tint/builtins/gen/exp/0f70eb.wgsl
index 69938fd08b..c72f26dc52 100644
--- a/test/tint/builtins/gen/exp/0f70eb.wgsl
+++ b/test/tint/builtins/gen/exp/0f70eb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl b/test/tint/builtins/gen/exp/1951e7.wgsl
index 3963c2e82e..a7de999485 100644
--- a/test/tint/builtins/gen/exp/1951e7.wgsl
+++ b/test/tint/builtins/gen/exp/1951e7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl b/test/tint/builtins/gen/exp/771fd2.wgsl
index 3b03860a15..9361a219b5 100644
--- a/test/tint/builtins/gen/exp/771fd2.wgsl
+++ b/test/tint/builtins/gen/exp/771fd2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp/d98450.wgsl b/test/tint/builtins/gen/exp/d98450.wgsl
index b33e510241..d3d666f9a4 100644
--- a/test/tint/builtins/gen/exp/d98450.wgsl
+++ b/test/tint/builtins/gen/exp/d98450.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl b/test/tint/builtins/gen/exp2/1f8680.wgsl
index 88c195d4dc..334932c578 100644
--- a/test/tint/builtins/gen/exp2/1f8680.wgsl
+++ b/test/tint/builtins/gen/exp2/1f8680.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl b/test/tint/builtins/gen/exp2/a9d0a7.wgsl
index 339275b184..31bfbbbc40 100644
--- a/test/tint/builtins/gen/exp2/a9d0a7.wgsl
+++ b/test/tint/builtins/gen/exp2/a9d0a7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl b/test/tint/builtins/gen/exp2/d6777c.wgsl
index 6463f4f366..ee1044e335 100644
--- a/test/tint/builtins/gen/exp2/d6777c.wgsl
+++ b/test/tint/builtins/gen/exp2/d6777c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl b/test/tint/builtins/gen/exp2/dea523.wgsl
index b85362544f..65a879ccea 100644
--- a/test/tint/builtins/gen/exp2/dea523.wgsl
+++ b/test/tint/builtins/gen/exp2/dea523.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/12b197.wgsl b/test/tint/builtins/gen/extractBits/12b197.wgsl
index d431f5631d..7777e581e7 100644
--- a/test/tint/builtins/gen/extractBits/12b197.wgsl
+++ b/test/tint/builtins/gen/extractBits/12b197.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/249874.wgsl b/test/tint/builtins/gen/extractBits/249874.wgsl
index 214ef6050e..8f67de0771 100644
--- a/test/tint/builtins/gen/extractBits/249874.wgsl
+++ b/test/tint/builtins/gen/extractBits/249874.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/631377.wgsl b/test/tint/builtins/gen/extractBits/631377.wgsl
index d750cd4dae..824f5a41f9 100644
--- a/test/tint/builtins/gen/extractBits/631377.wgsl
+++ b/test/tint/builtins/gen/extractBits/631377.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/a99a8d.wgsl b/test/tint/builtins/gen/extractBits/a99a8d.wgsl
index 241476a747..7313723eb1 100644
--- a/test/tint/builtins/gen/extractBits/a99a8d.wgsl
+++ b/test/tint/builtins/gen/extractBits/a99a8d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/ce81f8.wgsl b/test/tint/builtins/gen/extractBits/ce81f8.wgsl
index c22e61744e..c546e96b9f 100644
--- a/test/tint/builtins/gen/extractBits/ce81f8.wgsl
+++ b/test/tint/builtins/gen/extractBits/ce81f8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/e04f5d.wgsl b/test/tint/builtins/gen/extractBits/e04f5d.wgsl
index 69842f448a..783ae66ab6 100644
--- a/test/tint/builtins/gen/extractBits/e04f5d.wgsl
+++ b/test/tint/builtins/gen/extractBits/e04f5d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/f28f69.wgsl b/test/tint/builtins/gen/extractBits/f28f69.wgsl
index 3d53394878..e98dd9788c 100644
--- a/test/tint/builtins/gen/extractBits/f28f69.wgsl
+++ b/test/tint/builtins/gen/extractBits/f28f69.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/extractBits/fb850f.wgsl b/test/tint/builtins/gen/extractBits/fb850f.wgsl
index 0654c65735..73279336d2 100644
--- a/test/tint/builtins/gen/extractBits/fb850f.wgsl
+++ b/test/tint/builtins/gen/extractBits/fb850f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl b/test/tint/builtins/gen/faceForward/5afbd5.wgsl
index 33b4b73652..73c26b144b 100644
--- a/test/tint/builtins/gen/faceForward/5afbd5.wgsl
+++ b/test/tint/builtins/gen/faceForward/5afbd5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl b/test/tint/builtins/gen/faceForward/b316e5.wgsl
index 56142e30c2..67d10314a7 100644
--- a/test/tint/builtins/gen/faceForward/b316e5.wgsl
+++ b/test/tint/builtins/gen/faceForward/b316e5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl b/test/tint/builtins/gen/faceForward/e6908b.wgsl
index be801db711..c10108198a 100644
--- a/test/tint/builtins/gen/faceForward/e6908b.wgsl
+++ b/test/tint/builtins/gen/faceForward/e6908b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl b/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl
index f8756c404e..0a8a5da2d7 100644
--- a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl b/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl
index f5f6ae0eba..6fd1880537 100644
--- a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl b/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl
index cf3c903f57..3dcfca1659 100644
--- a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl b/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl
index fd9559f0d8..7a77849eef 100644
--- a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl b/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl
index bf6b11c00b..6f22f4c409 100644
--- a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl b/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl
index 737392eb84..984432418a 100644
--- a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl b/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl
index b085fdf752..5b1610e155 100644
--- a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl b/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl
index a7e746002f..6d1365d326 100644
--- a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl
+++ b/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl b/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl
index 5353983afe..9128ec42db 100644
--- a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl b/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl
index 888fc91755..7ac0acf1fe 100644
--- a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl b/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl
index 5e5cdb0d3b..05678e5a7c 100644
--- a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl b/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl
index b74f882125..43f7a728c2 100644
--- a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl b/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl
index c30a1b05fd..faab74f189 100644
--- a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl b/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl
index 3986a0e975..5d106be138 100644
--- a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl b/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl
index 91233163a3..5bf7d26b4f 100644
--- a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl b/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl
index 62ee22a845..62ed98ef72 100644
--- a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl
+++ b/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl b/test/tint/builtins/gen/floor/3bccc4.wgsl
index 31b2cdab9e..ac8b3d4694 100644
--- a/test/tint/builtins/gen/floor/3bccc4.wgsl
+++ b/test/tint/builtins/gen/floor/3bccc4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl b/test/tint/builtins/gen/floor/5fc9ac.wgsl
index 7628a404b7..cdc9c45a1b 100644
--- a/test/tint/builtins/gen/floor/5fc9ac.wgsl
+++ b/test/tint/builtins/gen/floor/5fc9ac.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl b/test/tint/builtins/gen/floor/60d7ea.wgsl
index 5411952ba0..a8bf8b6807 100644
--- a/test/tint/builtins/gen/floor/60d7ea.wgsl
+++ b/test/tint/builtins/gen/floor/60d7ea.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/floor/66f154.wgsl b/test/tint/builtins/gen/floor/66f154.wgsl
index 3c438df229..1f0c1f8a94 100644
--- a/test/tint/builtins/gen/floor/66f154.wgsl
+++ b/test/tint/builtins/gen/floor/66f154.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl b/test/tint/builtins/gen/fma/26a7a9.wgsl
index 0c726f6120..8d1b31ae93 100644
--- a/test/tint/builtins/gen/fma/26a7a9.wgsl
+++ b/test/tint/builtins/gen/fma/26a7a9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl b/test/tint/builtins/gen/fma/6a3283.wgsl
index 05d4481882..7304803533 100644
--- a/test/tint/builtins/gen/fma/6a3283.wgsl
+++ b/test/tint/builtins/gen/fma/6a3283.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl b/test/tint/builtins/gen/fma/c10ba3.wgsl
index 608d2f5517..b7099cc291 100644
--- a/test/tint/builtins/gen/fma/c10ba3.wgsl
+++ b/test/tint/builtins/gen/fma/c10ba3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl b/test/tint/builtins/gen/fma/e17c5c.wgsl
index 0be2ea7634..1729e62895 100644
--- a/test/tint/builtins/gen/fma/e17c5c.wgsl
+++ b/test/tint/builtins/gen/fma/e17c5c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl b/test/tint/builtins/gen/fract/8bc1e9.wgsl
index 1d423a483c..2e3663bc3a 100644
--- a/test/tint/builtins/gen/fract/8bc1e9.wgsl
+++ b/test/tint/builtins/gen/fract/8bc1e9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl b/test/tint/builtins/gen/fract/943cb1.wgsl
index e137bb2471..940f4692e1 100644
--- a/test/tint/builtins/gen/fract/943cb1.wgsl
+++ b/test/tint/builtins/gen/fract/943cb1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fract/a49758.wgsl b/test/tint/builtins/gen/fract/a49758.wgsl
index 148492efdc..e8d73a0428 100644
--- a/test/tint/builtins/gen/fract/a49758.wgsl
+++ b/test/tint/builtins/gen/fract/a49758.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl b/test/tint/builtins/gen/fract/fa5c71.wgsl
index bd0145bc59..ec0fed4f0b 100644
--- a/test/tint/builtins/gen/fract/fa5c71.wgsl
+++ b/test/tint/builtins/gen/fract/fa5c71.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/frexp/368997.wgsl b/test/tint/builtins/gen/frexp/368997.wgsl
index e58770fe5e..57930edfe0 100644
--- a/test/tint/builtins/gen/frexp/368997.wgsl
+++ b/test/tint/builtins/gen/frexp/368997.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl b/test/tint/builtins/gen/frexp/3c4f48.wgsl
index 2e9c241a72..74a8ef1582 100644
--- a/test/tint/builtins/gen/frexp/3c4f48.wgsl
+++ b/test/tint/builtins/gen/frexp/3c4f48.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl b/test/tint/builtins/gen/frexp/4bdfc7.wgsl
index bf08ec0a0e..c9471780e3 100644
--- a/test/tint/builtins/gen/frexp/4bdfc7.wgsl
+++ b/test/tint/builtins/gen/frexp/4bdfc7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl b/test/tint/builtins/gen/frexp/eabd40.wgsl
index c3d364a14d..9eeab1d8da 100644
--- a/test/tint/builtins/gen/frexp/eabd40.wgsl
+++ b/test/tint/builtins/gen/frexp/eabd40.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl b/test/tint/builtins/gen/fwidth/5d1b39.wgsl
index 8be9e8e4f3..b0f3e21a43 100644
--- a/test/tint/builtins/gen/fwidth/5d1b39.wgsl
+++ b/test/tint/builtins/gen/fwidth/5d1b39.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl b/test/tint/builtins/gen/fwidth/b83ebb.wgsl
index 78eed5326e..d4d9fd7b49 100644
--- a/test/tint/builtins/gen/fwidth/b83ebb.wgsl
+++ b/test/tint/builtins/gen/fwidth/b83ebb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl b/test/tint/builtins/gen/fwidth/d2ab9a.wgsl
index 2b8fc9e8c7..81dbd35078 100644
--- a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl
+++ b/test/tint/builtins/gen/fwidth/d2ab9a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl b/test/tint/builtins/gen/fwidth/df38ef.wgsl
index 96b05c54b9..3392f905ea 100644
--- a/test/tint/builtins/gen/fwidth/df38ef.wgsl
+++ b/test/tint/builtins/gen/fwidth/df38ef.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl b/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
index 26fbc0d8d1..bada6df2c3 100644
--- a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl b/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
index 9b9662a0c5..54a33245c2 100644
--- a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl b/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
index d45debf6f4..236b9edaa2 100644
--- a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl b/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
index 78a8a9a3a3..7bc209ded2 100644
--- a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl b/test/tint/builtins/gen/fwidthFine/523fdc.wgsl
index dbf7066c9b..7c95dd0076 100644
--- a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/523fdc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl b/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
index c9bc272318..20fef192fe 100644
--- a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl b/test/tint/builtins/gen/fwidthFine/f1742d.wgsl
index b3b89b4c0a..d24600cfae 100644
--- a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/f1742d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl b/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
index a0a53a026f..0002542937 100644
--- a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl b/test/tint/builtins/gen/insertBits/3c7ba5.wgsl
index d643261f3a..8816fa477b 100644
--- a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl
+++ b/test/tint/builtins/gen/insertBits/3c7ba5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/428b0b.wgsl b/test/tint/builtins/gen/insertBits/428b0b.wgsl
index e85f914e84..8fafe77d17 100644
--- a/test/tint/builtins/gen/insertBits/428b0b.wgsl
+++ b/test/tint/builtins/gen/insertBits/428b0b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/51ede1.wgsl b/test/tint/builtins/gen/insertBits/51ede1.wgsl
index eee6f01df9..e21ce9b1da 100644
--- a/test/tint/builtins/gen/insertBits/51ede1.wgsl
+++ b/test/tint/builtins/gen/insertBits/51ede1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/65468b.wgsl b/test/tint/builtins/gen/insertBits/65468b.wgsl
index 8c21d58051..45fe4f9480 100644
--- a/test/tint/builtins/gen/insertBits/65468b.wgsl
+++ b/test/tint/builtins/gen/insertBits/65468b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/87826b.wgsl b/test/tint/builtins/gen/insertBits/87826b.wgsl
index dce9794211..66bbaebf56 100644
--- a/test/tint/builtins/gen/insertBits/87826b.wgsl
+++ b/test/tint/builtins/gen/insertBits/87826b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/d86978.wgsl b/test/tint/builtins/gen/insertBits/d86978.wgsl
index f6f27c89a0..3de726399d 100644
--- a/test/tint/builtins/gen/insertBits/d86978.wgsl
+++ b/test/tint/builtins/gen/insertBits/d86978.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl b/test/tint/builtins/gen/insertBits/e3e3a2.wgsl
index 61635d7a32..2a43d7e314 100644
--- a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl
+++ b/test/tint/builtins/gen/insertBits/e3e3a2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl b/test/tint/builtins/gen/insertBits/fe6ba6.wgsl
index 45ffca787b..550a23997c 100644
--- a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl
+++ b/test/tint/builtins/gen/insertBits/fe6ba6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl b/test/tint/builtins/gen/inverseSqrt/84407e.wgsl
index dfd7333176..42711dffa3 100644
--- a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/84407e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl b/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
index 6c1fc59a0f..3e2c581199 100644
--- a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl b/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
index 6227839bc4..9edad1ba7c 100644
--- a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl b/test/tint/builtins/gen/inverseSqrt/c22347.wgsl
index 477aad920a..a0394fb90d 100644
--- a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/c22347.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl b/test/tint/builtins/gen/ldexp/a31cdc.wgsl
index ed82bca17b..1a0c392210 100644
--- a/test/tint/builtins/gen/ldexp/a31cdc.wgsl
+++ b/test/tint/builtins/gen/ldexp/a31cdc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl b/test/tint/builtins/gen/ldexp/abd718.wgsl
index cc0c1d8e5c..ffa468a9dd 100644
--- a/test/tint/builtins/gen/ldexp/abd718.wgsl
+++ b/test/tint/builtins/gen/ldexp/abd718.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl b/test/tint/builtins/gen/ldexp/cc9cde.wgsl
index 73e300bace..f2774fde35 100644
--- a/test/tint/builtins/gen/ldexp/cc9cde.wgsl
+++ b/test/tint/builtins/gen/ldexp/cc9cde.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl b/test/tint/builtins/gen/ldexp/db8b49.wgsl
index 5df9f3d10c..aad5fdcae7 100644
--- a/test/tint/builtins/gen/ldexp/db8b49.wgsl
+++ b/test/tint/builtins/gen/ldexp/db8b49.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/length/056071.wgsl b/test/tint/builtins/gen/length/056071.wgsl
index fd54ff040f..34bc10d70b 100644
--- a/test/tint/builtins/gen/length/056071.wgsl
+++ b/test/tint/builtins/gen/length/056071.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/length/602a17.wgsl b/test/tint/builtins/gen/length/602a17.wgsl
index 4284883de0..a2f82a6e26 100644
--- a/test/tint/builtins/gen/length/602a17.wgsl
+++ b/test/tint/builtins/gen/length/602a17.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/length/afde8b.wgsl b/test/tint/builtins/gen/length/afde8b.wgsl
index 11a621bd58..4f4ec0b84e 100644
--- a/test/tint/builtins/gen/length/afde8b.wgsl
+++ b/test/tint/builtins/gen/length/afde8b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/length/becebf.wgsl b/test/tint/builtins/gen/length/becebf.wgsl
index d2cdcca7fd..ea489454b2 100644
--- a/test/tint/builtins/gen/length/becebf.wgsl
+++ b/test/tint/builtins/gen/length/becebf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log/3da25a.wgsl b/test/tint/builtins/gen/log/3da25a.wgsl
index c080ec39d3..c487a2028b 100644
--- a/test/tint/builtins/gen/log/3da25a.wgsl
+++ b/test/tint/builtins/gen/log/3da25a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log/7114a6.wgsl b/test/tint/builtins/gen/log/7114a6.wgsl
index f444dd608e..b3c4b747c8 100644
--- a/test/tint/builtins/gen/log/7114a6.wgsl
+++ b/test/tint/builtins/gen/log/7114a6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl b/test/tint/builtins/gen/log/b2ce28.wgsl
index 2c1f211698..1a52cf45c0 100644
--- a/test/tint/builtins/gen/log/b2ce28.wgsl
+++ b/test/tint/builtins/gen/log/b2ce28.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log/f4c570.wgsl b/test/tint/builtins/gen/log/f4c570.wgsl
index abda0dd0f4..f6a1a388aa 100644
--- a/test/tint/builtins/gen/log/f4c570.wgsl
+++ b/test/tint/builtins/gen/log/f4c570.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl b/test/tint/builtins/gen/log2/4036ed.wgsl
index 6c9fd0e9ee..bd4b0f34a9 100644
--- a/test/tint/builtins/gen/log2/4036ed.wgsl
+++ b/test/tint/builtins/gen/log2/4036ed.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log2/902988.wgsl b/test/tint/builtins/gen/log2/902988.wgsl
index 7f1c68e931..19328feb7c 100644
--- a/test/tint/builtins/gen/log2/902988.wgsl
+++ b/test/tint/builtins/gen/log2/902988.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log2/adb233.wgsl b/test/tint/builtins/gen/log2/adb233.wgsl
index 6aad52cee4..dfd796f073 100644
--- a/test/tint/builtins/gen/log2/adb233.wgsl
+++ b/test/tint/builtins/gen/log2/adb233.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/log2/aea659.wgsl b/test/tint/builtins/gen/log2/aea659.wgsl
index 6ce19165b1..1cc02c6271 100644
--- a/test/tint/builtins/gen/log2/aea659.wgsl
+++ b/test/tint/builtins/gen/log2/aea659.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl b/test/tint/builtins/gen/max/0c0aae.wgsl
index fb3df4da51..0df86118f6 100644
--- a/test/tint/builtins/gen/max/0c0aae.wgsl
+++ b/test/tint/builtins/gen/max/0c0aae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/25eafe.wgsl b/test/tint/builtins/gen/max/25eafe.wgsl
index 18ace6d43a..b86d13796a 100644
--- a/test/tint/builtins/gen/max/25eafe.wgsl
+++ b/test/tint/builtins/gen/max/25eafe.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/320815.wgsl b/test/tint/builtins/gen/max/320815.wgsl
index e4f6b564b9..c931f35972 100644
--- a/test/tint/builtins/gen/max/320815.wgsl
+++ b/test/tint/builtins/gen/max/320815.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/44a39d.wgsl b/test/tint/builtins/gen/max/44a39d.wgsl
index 89be332db6..02154637c9 100644
--- a/test/tint/builtins/gen/max/44a39d.wgsl
+++ b/test/tint/builtins/gen/max/44a39d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/453e04.wgsl b/test/tint/builtins/gen/max/453e04.wgsl
index 677a411f6b..9d55ca87e2 100644
--- a/test/tint/builtins/gen/max/453e04.wgsl
+++ b/test/tint/builtins/gen/max/453e04.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/462050.wgsl b/test/tint/builtins/gen/max/462050.wgsl
index 795d7db707..bbff876d5f 100644
--- a/test/tint/builtins/gen/max/462050.wgsl
+++ b/test/tint/builtins/gen/max/462050.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/4883ac.wgsl b/test/tint/builtins/gen/max/4883ac.wgsl
index 472687c819..5656824b33 100644
--- a/test/tint/builtins/gen/max/4883ac.wgsl
+++ b/test/tint/builtins/gen/max/4883ac.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl b/test/tint/builtins/gen/max/85e6bc.wgsl
index 54f6b30b84..478a4059ce 100644
--- a/test/tint/builtins/gen/max/85e6bc.wgsl
+++ b/test/tint/builtins/gen/max/85e6bc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/a93419.wgsl b/test/tint/builtins/gen/max/a93419.wgsl
index 8f0cfba645..1779143aa3 100644
--- a/test/tint/builtins/gen/max/a93419.wgsl
+++ b/test/tint/builtins/gen/max/a93419.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl b/test/tint/builtins/gen/max/b1b73a.wgsl
index 378985ea9c..07dd4a2e83 100644
--- a/test/tint/builtins/gen/max/b1b73a.wgsl
+++ b/test/tint/builtins/gen/max/b1b73a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl b/test/tint/builtins/gen/max/ce7c30.wgsl
index b9ad0695d1..c119aaec29 100644
--- a/test/tint/builtins/gen/max/ce7c30.wgsl
+++ b/test/tint/builtins/gen/max/ce7c30.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/max/e8192f.wgsl b/test/tint/builtins/gen/max/e8192f.wgsl
index 4e59937dd0..aa0ebb30c6 100644
--- a/test/tint/builtins/gen/max/e8192f.wgsl
+++ b/test/tint/builtins/gen/max/e8192f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl b/test/tint/builtins/gen/min/03c7e3.wgsl
index 99c5c521ce..e237394855 100644
--- a/test/tint/builtins/gen/min/03c7e3.wgsl
+++ b/test/tint/builtins/gen/min/03c7e3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/0dc614.wgsl b/test/tint/builtins/gen/min/0dc614.wgsl
index 9fb101ca91..8c896eed08 100644
--- a/test/tint/builtins/gen/min/0dc614.wgsl
+++ b/test/tint/builtins/gen/min/0dc614.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/3941e1.wgsl b/test/tint/builtins/gen/min/3941e1.wgsl
index 1b35ffbe28..350d70f347 100644
--- a/test/tint/builtins/gen/min/3941e1.wgsl
+++ b/test/tint/builtins/gen/min/3941e1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl b/test/tint/builtins/gen/min/46c5d3.wgsl
index 57d6b7c9a7..9d6e7018ae 100644
--- a/test/tint/builtins/gen/min/46c5d3.wgsl
+++ b/test/tint/builtins/gen/min/46c5d3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/82b28f.wgsl b/test/tint/builtins/gen/min/82b28f.wgsl
index 57d999a96d..b6e12bc186 100644
--- a/test/tint/builtins/gen/min/82b28f.wgsl
+++ b/test/tint/builtins/gen/min/82b28f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl b/test/tint/builtins/gen/min/93cfc4.wgsl
index cb4953ec2c..bb98a54774 100644
--- a/test/tint/builtins/gen/min/93cfc4.wgsl
+++ b/test/tint/builtins/gen/min/93cfc4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/a45171.wgsl b/test/tint/builtins/gen/min/a45171.wgsl
index 0960d1f3d7..4504a1a3c2 100644
--- a/test/tint/builtins/gen/min/a45171.wgsl
+++ b/test/tint/builtins/gen/min/a45171.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl b/test/tint/builtins/gen/min/aa28ad.wgsl
index 2fdaace332..741e3cb72d 100644
--- a/test/tint/builtins/gen/min/aa28ad.wgsl
+++ b/test/tint/builtins/gen/min/aa28ad.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/af326d.wgsl b/test/tint/builtins/gen/min/af326d.wgsl
index f6346b3033..aa0b6dabce 100644
--- a/test/tint/builtins/gen/min/af326d.wgsl
+++ b/test/tint/builtins/gen/min/af326d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl b/test/tint/builtins/gen/min/c70bb7.wgsl
index 7837b1cf93..3be96121a5 100644
--- a/test/tint/builtins/gen/min/c70bb7.wgsl
+++ b/test/tint/builtins/gen/min/c70bb7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/c73147.wgsl b/test/tint/builtins/gen/min/c73147.wgsl
index 0274f54c4b..80b0a21024 100644
--- a/test/tint/builtins/gen/min/c73147.wgsl
+++ b/test/tint/builtins/gen/min/c73147.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl b/test/tint/builtins/gen/min/c76fa6.wgsl
index 57d89ebb92..1de3701499 100644
--- a/test/tint/builtins/gen/min/c76fa6.wgsl
+++ b/test/tint/builtins/gen/min/c76fa6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl b/test/tint/builtins/gen/mix/0c8c33.wgsl
index 426df70d70..a78946ce20 100644
--- a/test/tint/builtins/gen/mix/0c8c33.wgsl
+++ b/test/tint/builtins/gen/mix/0c8c33.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl b/test/tint/builtins/gen/mix/1faeb1.wgsl
index 5c4441f138..d453ef65fc 100644
--- a/test/tint/builtins/gen/mix/1faeb1.wgsl
+++ b/test/tint/builtins/gen/mix/1faeb1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl b/test/tint/builtins/gen/mix/2fadab.wgsl
index d119b89ced..a360975402 100644
--- a/test/tint/builtins/gen/mix/2fadab.wgsl
+++ b/test/tint/builtins/gen/mix/2fadab.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/mix/315264.wgsl b/test/tint/builtins/gen/mix/315264.wgsl
index bb1bde18a4..c70834f31e 100644
--- a/test/tint/builtins/gen/mix/315264.wgsl
+++ b/test/tint/builtins/gen/mix/315264.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl b/test/tint/builtins/gen/mix/4f0b5e.wgsl
index 588fcec818..0b075862b5 100644
--- a/test/tint/builtins/gen/mix/4f0b5e.wgsl
+++ b/test/tint/builtins/gen/mix/4f0b5e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl b/test/tint/builtins/gen/mix/6f8adc.wgsl
index d6b858a2f2..ad177e2840 100644
--- a/test/tint/builtins/gen/mix/6f8adc.wgsl
+++ b/test/tint/builtins/gen/mix/6f8adc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl b/test/tint/builtins/gen/mix/c37ede.wgsl
index 430db8b33d..d72f984be8 100644
--- a/test/tint/builtins/gen/mix/c37ede.wgsl
+++ b/test/tint/builtins/gen/mix/c37ede.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/modf/180fed.wgsl b/test/tint/builtins/gen/modf/180fed.wgsl
index 50809abb4b..962e3f3264 100644
--- a/test/tint/builtins/gen/modf/180fed.wgsl
+++ b/test/tint/builtins/gen/modf/180fed.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl b/test/tint/builtins/gen/modf/9b75f7.wgsl
index 538bcf0686..aff6139558 100644
--- a/test/tint/builtins/gen/modf/9b75f7.wgsl
+++ b/test/tint/builtins/gen/modf/9b75f7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl b/test/tint/builtins/gen/modf/ec2dbc.wgsl
index 293964850e..3bf8cb7d68 100644
--- a/test/tint/builtins/gen/modf/ec2dbc.wgsl
+++ b/test/tint/builtins/gen/modf/ec2dbc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl b/test/tint/builtins/gen/modf/f5f20d.wgsl
index 344c9e8ba5..c251d46b3c 100644
--- a/test/tint/builtins/gen/modf/f5f20d.wgsl
+++ b/test/tint/builtins/gen/modf/f5f20d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl b/test/tint/builtins/gen/normalize/64d8c0.wgsl
index 35f1687cba..4843a9e59c 100644
--- a/test/tint/builtins/gen/normalize/64d8c0.wgsl
+++ b/test/tint/builtins/gen/normalize/64d8c0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl b/test/tint/builtins/gen/normalize/9a0aab.wgsl
index d6b79451df..4bb13a2e03 100644
--- a/test/tint/builtins/gen/normalize/9a0aab.wgsl
+++ b/test/tint/builtins/gen/normalize/9a0aab.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl b/test/tint/builtins/gen/normalize/fc2ef1.wgsl
index 5b23870e49..f56eb0eb0b 100644
--- a/test/tint/builtins/gen/normalize/fc2ef1.wgsl
+++ b/test/tint/builtins/gen/normalize/fc2ef1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl b/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
index 7c6d21ab3d..978bf65bf9 100644
--- a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
+++ b/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl b/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
index 5895e33d5e..24346b79e2 100644
--- a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
+++ b/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl b/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
index 29726d6da4..037c11b5fb 100644
--- a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
+++ b/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl b/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
index 02728464ef..681af1d4f4 100644
--- a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
+++ b/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl b/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
index bf91c35237..ae25428f67 100644
--- a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
+++ b/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pow/04a908.wgsl b/test/tint/builtins/gen/pow/04a908.wgsl
index a25f8ffaa8..b195279684 100644
--- a/test/tint/builtins/gen/pow/04a908.wgsl
+++ b/test/tint/builtins/gen/pow/04a908.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pow/46e029.wgsl b/test/tint/builtins/gen/pow/46e029.wgsl
index 12060f67f7..fbe76121be 100644
--- a/test/tint/builtins/gen/pow/46e029.wgsl
+++ b/test/tint/builtins/gen/pow/46e029.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl b/test/tint/builtins/gen/pow/4a46c9.wgsl
index 02c68c05d1..c8293dfd2c 100644
--- a/test/tint/builtins/gen/pow/4a46c9.wgsl
+++ b/test/tint/builtins/gen/pow/4a46c9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl b/test/tint/builtins/gen/pow/e60ea5.wgsl
index a7bcc9436a..f718b1e96b 100644
--- a/test/tint/builtins/gen/pow/e60ea5.wgsl
+++ b/test/tint/builtins/gen/pow/e60ea5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl b/test/tint/builtins/gen/radians/09b7fc.wgsl
index 35a621f47a..96d745ebbe 100644
--- a/test/tint/builtins/gen/radians/09b7fc.wgsl
+++ b/test/tint/builtins/gen/radians/09b7fc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/radians/61687a.wgsl b/test/tint/builtins/gen/radians/61687a.wgsl
index 6bfbc07574..f5f8a32977 100644
--- a/test/tint/builtins/gen/radians/61687a.wgsl
+++ b/test/tint/builtins/gen/radians/61687a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl b/test/tint/builtins/gen/radians/6b0ff2.wgsl
index 5e11c02162..859ff69687 100644
--- a/test/tint/builtins/gen/radians/6b0ff2.wgsl
+++ b/test/tint/builtins/gen/radians/6b0ff2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/radians/f96258.wgsl b/test/tint/builtins/gen/radians/f96258.wgsl
index e093182e83..0e86d0e856 100644
--- a/test/tint/builtins/gen/radians/f96258.wgsl
+++ b/test/tint/builtins/gen/radians/f96258.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl b/test/tint/builtins/gen/reflect/05357e.wgsl
index c6e1d76993..ef948954e0 100644
--- a/test/tint/builtins/gen/reflect/05357e.wgsl
+++ b/test/tint/builtins/gen/reflect/05357e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl b/test/tint/builtins/gen/reflect/b61e10.wgsl
index 247c913d9e..47cd039a3b 100644
--- a/test/tint/builtins/gen/reflect/b61e10.wgsl
+++ b/test/tint/builtins/gen/reflect/b61e10.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl b/test/tint/builtins/gen/reflect/f47fdb.wgsl
index 522fdac1cf..5bbf74c0e8 100644
--- a/test/tint/builtins/gen/reflect/f47fdb.wgsl
+++ b/test/tint/builtins/gen/reflect/f47fdb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl b/test/tint/builtins/gen/refract/7e02e6.wgsl
index c5bd36e828..1a2e7e4df4 100644
--- a/test/tint/builtins/gen/refract/7e02e6.wgsl
+++ b/test/tint/builtins/gen/refract/7e02e6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl b/test/tint/builtins/gen/refract/cbc1d2.wgsl
index 80b7a6e60d..f34e7cd82c 100644
--- a/test/tint/builtins/gen/refract/cbc1d2.wgsl
+++ b/test/tint/builtins/gen/refract/cbc1d2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl b/test/tint/builtins/gen/refract/cd905f.wgsl
index 15d20dabdf..d5338347be 100644
--- a/test/tint/builtins/gen/refract/cd905f.wgsl
+++ b/test/tint/builtins/gen/refract/cd905f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl b/test/tint/builtins/gen/reverseBits/222177.wgsl
index 66a921d531..1224dd9195 100644
--- a/test/tint/builtins/gen/reverseBits/222177.wgsl
+++ b/test/tint/builtins/gen/reverseBits/222177.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl b/test/tint/builtins/gen/reverseBits/35fea9.wgsl
index 48bb2e72d8..f62e494bc8 100644
--- a/test/tint/builtins/gen/reverseBits/35fea9.wgsl
+++ b/test/tint/builtins/gen/reverseBits/35fea9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl b/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
index ae6bccf810..b48ae4dcfa 100644
--- a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
+++ b/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl b/test/tint/builtins/gen/reverseBits/7c4269.wgsl
index a6c98640db..e0b5fe82ab 100644
--- a/test/tint/builtins/gen/reverseBits/7c4269.wgsl
+++ b/test/tint/builtins/gen/reverseBits/7c4269.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl b/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
index 315b5a19ff..6a104db301 100644
--- a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
+++ b/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl b/test/tint/builtins/gen/reverseBits/c21bc1.wgsl
index c5dcd2e38b..62e66a1839 100644
--- a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl
+++ b/test/tint/builtins/gen/reverseBits/c21bc1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl b/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
index 2e937c14ee..9bed87a3f2 100644
--- a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
+++ b/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl b/test/tint/builtins/gen/reverseBits/e31adf.wgsl
index 444c5ddfdf..2a599eb0aa 100644
--- a/test/tint/builtins/gen/reverseBits/e31adf.wgsl
+++ b/test/tint/builtins/gen/reverseBits/e31adf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/round/106c0b.wgsl b/test/tint/builtins/gen/round/106c0b.wgsl
index 92abf1528d..ab45faa67c 100644
--- a/test/tint/builtins/gen/round/106c0b.wgsl
+++ b/test/tint/builtins/gen/round/106c0b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/round/1c7897.wgsl b/test/tint/builtins/gen/round/1c7897.wgsl
index 110db4f207..cf9399677d 100644
--- a/test/tint/builtins/gen/round/1c7897.wgsl
+++ b/test/tint/builtins/gen/round/1c7897.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/round/52c84d.wgsl b/test/tint/builtins/gen/round/52c84d.wgsl
index b56593d94f..94dff00cde 100644
--- a/test/tint/builtins/gen/round/52c84d.wgsl
+++ b/test/tint/builtins/gen/round/52c84d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/round/9edc38.wgsl b/test/tint/builtins/gen/round/9edc38.wgsl
index 99a0391e31..f0d74685e4 100644
--- a/test/tint/builtins/gen/round/9edc38.wgsl
+++ b/test/tint/builtins/gen/round/9edc38.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/00b848.wgsl b/test/tint/builtins/gen/select/00b848.wgsl
index c7c4e14421..cfe6e06565 100644
--- a/test/tint/builtins/gen/select/00b848.wgsl
+++ b/test/tint/builtins/gen/select/00b848.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl b/test/tint/builtins/gen/select/01e2cd.wgsl
index 9cb446d53e..8e2a17b736 100644
--- a/test/tint/builtins/gen/select/01e2cd.wgsl
+++ b/test/tint/builtins/gen/select/01e2cd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/087ea4.wgsl b/test/tint/builtins/gen/select/087ea4.wgsl
index 472afb58ba..17021a126e 100644
--- a/test/tint/builtins/gen/select/087ea4.wgsl
+++ b/test/tint/builtins/gen/select/087ea4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/1e960b.wgsl b/test/tint/builtins/gen/select/1e960b.wgsl
index 9b69ab54de..7ccf1112dc 100644
--- a/test/tint/builtins/gen/select/1e960b.wgsl
+++ b/test/tint/builtins/gen/select/1e960b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/266aff.wgsl b/test/tint/builtins/gen/select/266aff.wgsl
index 32e95fcba1..d475b4a130 100644
--- a/test/tint/builtins/gen/select/266aff.wgsl
+++ b/test/tint/builtins/gen/select/266aff.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/28a27e.wgsl b/test/tint/builtins/gen/select/28a27e.wgsl
index 85b4778bee..149379ef14 100644
--- a/test/tint/builtins/gen/select/28a27e.wgsl
+++ b/test/tint/builtins/gen/select/28a27e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl b/test/tint/builtins/gen/select/3c25ce.wgsl
index 74a0235374..a855d398f5 100644
--- a/test/tint/builtins/gen/select/3c25ce.wgsl
+++ b/test/tint/builtins/gen/select/3c25ce.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/416e14.wgsl b/test/tint/builtins/gen/select/416e14.wgsl
index c33ac0e48d..b953b5ad29 100644
--- a/test/tint/builtins/gen/select/416e14.wgsl
+++ b/test/tint/builtins/gen/select/416e14.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/51b047.wgsl b/test/tint/builtins/gen/select/51b047.wgsl
index 87d4693691..702cdedde9 100644
--- a/test/tint/builtins/gen/select/51b047.wgsl
+++ b/test/tint/builtins/gen/select/51b047.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/713567.wgsl b/test/tint/builtins/gen/select/713567.wgsl
index 7ef740f71e..3473d9f0c5 100644
--- a/test/tint/builtins/gen/select/713567.wgsl
+++ b/test/tint/builtins/gen/select/713567.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/78be5f.wgsl b/test/tint/builtins/gen/select/78be5f.wgsl
index 49a37735e8..3b95703cde 100644
--- a/test/tint/builtins/gen/select/78be5f.wgsl
+++ b/test/tint/builtins/gen/select/78be5f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl b/test/tint/builtins/gen/select/80a9a9.wgsl
index 0eaaddd10b..f24b7f63ee 100644
--- a/test/tint/builtins/gen/select/80a9a9.wgsl
+++ b/test/tint/builtins/gen/select/80a9a9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl b/test/tint/builtins/gen/select/8fa62c.wgsl
index 8457c9c71d..c5f67f32cd 100644
--- a/test/tint/builtins/gen/select/8fa62c.wgsl
+++ b/test/tint/builtins/gen/select/8fa62c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/99f883.wgsl b/test/tint/builtins/gen/select/99f883.wgsl
index 1c05b014fa..a292314c40 100644
--- a/test/tint/builtins/gen/select/99f883.wgsl
+++ b/test/tint/builtins/gen/select/99f883.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/a2860e.wgsl b/test/tint/builtins/gen/select/a2860e.wgsl
index ea40ec53ff..0f8a6354cd 100644
--- a/test/tint/builtins/gen/select/a2860e.wgsl
+++ b/test/tint/builtins/gen/select/a2860e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/ab069f.wgsl b/test/tint/builtins/gen/select/ab069f.wgsl
index b05dddaf87..d138d9e34e 100644
--- a/test/tint/builtins/gen/select/ab069f.wgsl
+++ b/test/tint/builtins/gen/select/ab069f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/b04721.wgsl b/test/tint/builtins/gen/select/b04721.wgsl
index fb5ad56d09..7f084562de 100644
--- a/test/tint/builtins/gen/select/b04721.wgsl
+++ b/test/tint/builtins/gen/select/b04721.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/bb447f.wgsl b/test/tint/builtins/gen/select/bb447f.wgsl
index 2a6f85bb00..4ad509c0c9 100644
--- a/test/tint/builtins/gen/select/bb447f.wgsl
+++ b/test/tint/builtins/gen/select/bb447f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl b/test/tint/builtins/gen/select/bb8aae.wgsl
index 8bcb4efb28..f8ea5558b9 100644
--- a/test/tint/builtins/gen/select/bb8aae.wgsl
+++ b/test/tint/builtins/gen/select/bb8aae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl b/test/tint/builtins/gen/select/bf3d29.wgsl
index 086cb87b72..411feeb1d7 100644
--- a/test/tint/builtins/gen/select/bf3d29.wgsl
+++ b/test/tint/builtins/gen/select/bf3d29.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl b/test/tint/builtins/gen/select/c31f9e.wgsl
index 9c88e0c0d8..90cd213202 100644
--- a/test/tint/builtins/gen/select/c31f9e.wgsl
+++ b/test/tint/builtins/gen/select/c31f9e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl b/test/tint/builtins/gen/select/c41bd1.wgsl
index 9b25fa14ee..fe6b19c428 100644
--- a/test/tint/builtins/gen/select/c41bd1.wgsl
+++ b/test/tint/builtins/gen/select/c41bd1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl b/test/tint/builtins/gen/select/c4a4ef.wgsl
index 829a645ce7..36d6fe1885 100644
--- a/test/tint/builtins/gen/select/c4a4ef.wgsl
+++ b/test/tint/builtins/gen/select/c4a4ef.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/cb9301.wgsl b/test/tint/builtins/gen/select/cb9301.wgsl
index 9cb7f66b31..90deaf256b 100644
--- a/test/tint/builtins/gen/select/cb9301.wgsl
+++ b/test/tint/builtins/gen/select/cb9301.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/e3e028.wgsl b/test/tint/builtins/gen/select/e3e028.wgsl
index a16dc3f4d3..d1fc18e461 100644
--- a/test/tint/builtins/gen/select/e3e028.wgsl
+++ b/test/tint/builtins/gen/select/e3e028.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl b/test/tint/builtins/gen/select/ebfea2.wgsl
index 97855827b3..24056f3182 100644
--- a/test/tint/builtins/gen/select/ebfea2.wgsl
+++ b/test/tint/builtins/gen/select/ebfea2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl b/test/tint/builtins/gen/select/ed8a15.wgsl
index bf8afaf537..10986bf66c 100644
--- a/test/tint/builtins/gen/select/ed8a15.wgsl
+++ b/test/tint/builtins/gen/select/ed8a15.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl b/test/tint/builtins/gen/select/fb7e53.wgsl
index 2513b57867..f81d8df49d 100644
--- a/test/tint/builtins/gen/select/fb7e53.wgsl
+++ b/test/tint/builtins/gen/select/fb7e53.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sign/159665.wgsl b/test/tint/builtins/gen/sign/159665.wgsl
index 5234109d10..2cfae2efa3 100644
--- a/test/tint/builtins/gen/sign/159665.wgsl
+++ b/test/tint/builtins/gen/sign/159665.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl b/test/tint/builtins/gen/sign/b8f634.wgsl
index 2ce41afec2..7b936e3ba9 100644
--- a/test/tint/builtins/gen/sign/b8f634.wgsl
+++ b/test/tint/builtins/gen/sign/b8f634.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl b/test/tint/builtins/gen/sign/d065d8.wgsl
index 1d5b548cfb..1dadd5c76f 100644
--- a/test/tint/builtins/gen/sign/d065d8.wgsl
+++ b/test/tint/builtins/gen/sign/d065d8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl b/test/tint/builtins/gen/sign/dd790e.wgsl
index ac68d39fc9..0124aa81b0 100644
--- a/test/tint/builtins/gen/sign/dd790e.wgsl
+++ b/test/tint/builtins/gen/sign/dd790e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sin/01f241.wgsl b/test/tint/builtins/gen/sin/01f241.wgsl
index 28bfe261d4..951c1b9f35 100644
--- a/test/tint/builtins/gen/sin/01f241.wgsl
+++ b/test/tint/builtins/gen/sin/01f241.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl b/test/tint/builtins/gen/sin/4e3979.wgsl
index dabf113b8d..5932c6f246 100644
--- a/test/tint/builtins/gen/sin/4e3979.wgsl
+++ b/test/tint/builtins/gen/sin/4e3979.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl b/test/tint/builtins/gen/sin/b78c91.wgsl
index f7e2641f9d..234b758799 100644
--- a/test/tint/builtins/gen/sin/b78c91.wgsl
+++ b/test/tint/builtins/gen/sin/b78c91.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl b/test/tint/builtins/gen/sin/fc8bc4.wgsl
index 45f5605bf5..a035f8c1c1 100644
--- a/test/tint/builtins/gen/sin/fc8bc4.wgsl
+++ b/test/tint/builtins/gen/sin/fc8bc4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl b/test/tint/builtins/gen/sinh/445e33.wgsl
index 87fa6c2a3a..bd3aff2e30 100644
--- a/test/tint/builtins/gen/sinh/445e33.wgsl
+++ b/test/tint/builtins/gen/sinh/445e33.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl b/test/tint/builtins/gen/sinh/7bb598.wgsl
index b2da9a5307..df3be7998e 100644
--- a/test/tint/builtins/gen/sinh/7bb598.wgsl
+++ b/test/tint/builtins/gen/sinh/7bb598.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl b/test/tint/builtins/gen/sinh/b9860e.wgsl
index b1666ef04d..7f4fa1d3b2 100644
--- a/test/tint/builtins/gen/sinh/b9860e.wgsl
+++ b/test/tint/builtins/gen/sinh/b9860e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl b/test/tint/builtins/gen/sinh/c9a5eb.wgsl
index 66ff96b7be..699d4a8c0d 100644
--- a/test/tint/builtins/gen/sinh/c9a5eb.wgsl
+++ b/test/tint/builtins/gen/sinh/c9a5eb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/smoothstep/392c19.wgsl b/test/tint/builtins/gen/smoothstep/392c19.wgsl
index a8a780a3e2..018e920ed3 100644
--- a/test/tint/builtins/gen/smoothstep/392c19.wgsl
+++ b/test/tint/builtins/gen/smoothstep/392c19.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/smoothstep/40864c.wgsl b/test/tint/builtins/gen/smoothstep/40864c.wgsl
index 1b188aaa90..403e8bff4e 100644
--- a/test/tint/builtins/gen/smoothstep/40864c.wgsl
+++ b/test/tint/builtins/gen/smoothstep/40864c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/smoothstep/6c4975.wgsl b/test/tint/builtins/gen/smoothstep/6c4975.wgsl
index 977093d003..aa22a453e5 100644
--- a/test/tint/builtins/gen/smoothstep/6c4975.wgsl
+++ b/test/tint/builtins/gen/smoothstep/6c4975.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/smoothstep/aad1db.wgsl b/test/tint/builtins/gen/smoothstep/aad1db.wgsl
index f4fea62e3a..a3960d6d26 100644
--- a/test/tint/builtins/gen/smoothstep/aad1db.wgsl
+++ b/test/tint/builtins/gen/smoothstep/aad1db.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl b/test/tint/builtins/gen/sqrt/20c74e.wgsl
index f5d13b74e7..50d97173bb 100644
--- a/test/tint/builtins/gen/sqrt/20c74e.wgsl
+++ b/test/tint/builtins/gen/sqrt/20c74e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl b/test/tint/builtins/gen/sqrt/8c7024.wgsl
index fd73ed8716..d2d31e7f35 100644
--- a/test/tint/builtins/gen/sqrt/8c7024.wgsl
+++ b/test/tint/builtins/gen/sqrt/8c7024.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl b/test/tint/builtins/gen/sqrt/aa0d7a.wgsl
index 835d0f3e1f..5cbb2c32e5 100644
--- a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl
+++ b/test/tint/builtins/gen/sqrt/aa0d7a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl b/test/tint/builtins/gen/sqrt/f8c59a.wgsl
index bf860d282b..82edecb7a0 100644
--- a/test/tint/builtins/gen/sqrt/f8c59a.wgsl
+++ b/test/tint/builtins/gen/sqrt/f8c59a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/step/0b073b.wgsl b/test/tint/builtins/gen/step/0b073b.wgsl
index 12a6a4217c..e90d956e3b 100644
--- a/test/tint/builtins/gen/step/0b073b.wgsl
+++ b/test/tint/builtins/gen/step/0b073b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/step/19accd.wgsl b/test/tint/builtins/gen/step/19accd.wgsl
index 7c6807d522..9f54581a1e 100644
--- a/test/tint/builtins/gen/step/19accd.wgsl
+++ b/test/tint/builtins/gen/step/19accd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/step/334303.wgsl b/test/tint/builtins/gen/step/334303.wgsl
index b9495b64e6..922ffb19fa 100644
--- a/test/tint/builtins/gen/step/334303.wgsl
+++ b/test/tint/builtins/gen/step/334303.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/step/e2b337.wgsl b/test/tint/builtins/gen/step/e2b337.wgsl
index 148689e160..218fde588e 100644
--- a/test/tint/builtins/gen/step/e2b337.wgsl
+++ b/test/tint/builtins/gen/step/e2b337.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl b/test/tint/builtins/gen/storageBarrier/d87211.wgsl
index 29253025bc..b98fa8c06c 100644
--- a/test/tint/builtins/gen/storageBarrier/d87211.wgsl
+++ b/test/tint/builtins/gen/storageBarrier/d87211.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl b/test/tint/builtins/gen/tan/244e2a.wgsl
index 1108dccca6..2d61b0e142 100644
--- a/test/tint/builtins/gen/tan/244e2a.wgsl
+++ b/test/tint/builtins/gen/tan/244e2a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl b/test/tint/builtins/gen/tan/2f030e.wgsl
index 005619a7e7..b5b038ad4d 100644
--- a/test/tint/builtins/gen/tan/2f030e.wgsl
+++ b/test/tint/builtins/gen/tan/2f030e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl b/test/tint/builtins/gen/tan/7ea104.wgsl
index a19522f57a..1a2554758f 100644
--- a/test/tint/builtins/gen/tan/7ea104.wgsl
+++ b/test/tint/builtins/gen/tan/7ea104.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl b/test/tint/builtins/gen/tan/8ce3e9.wgsl
index ddcaa32e99..ec2ff093b3 100644
--- a/test/tint/builtins/gen/tan/8ce3e9.wgsl
+++ b/test/tint/builtins/gen/tan/8ce3e9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl b/test/tint/builtins/gen/tanh/5663c5.wgsl
index cb860300d9..d8b3708273 100644
--- a/test/tint/builtins/gen/tanh/5663c5.wgsl
+++ b/test/tint/builtins/gen/tanh/5663c5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl b/test/tint/builtins/gen/tanh/5724b3.wgsl
index 3f881593cd..0a184d2360 100644
--- a/test/tint/builtins/gen/tanh/5724b3.wgsl
+++ b/test/tint/builtins/gen/tanh/5724b3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl b/test/tint/builtins/gen/tanh/9f9fb9.wgsl
index e090651aea..861bf41388 100644
--- a/test/tint/builtins/gen/tanh/9f9fb9.wgsl
+++ b/test/tint/builtins/gen/tanh/9f9fb9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl b/test/tint/builtins/gen/tanh/c15fdb.wgsl
index 71a6cb404d..35b0597a79 100644
--- a/test/tint/builtins/gen/tanh/c15fdb.wgsl
+++ b/test/tint/builtins/gen/tanh/c15fdb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl b/test/tint/builtins/gen/textureDimensions/002b2a.wgsl
index 7747aea46e..3edc18bd1b 100644
--- a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/002b2a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl b/test/tint/builtins/gen/textureDimensions/012b82.wgsl
index 49d760be79..af04cf494a 100644
--- a/test/tint/builtins/gen/textureDimensions/012b82.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/012b82.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl b/test/tint/builtins/gen/textureDimensions/08753d.wgsl
index b8ad116f18..e012e2c50f 100644
--- a/test/tint/builtins/gen/textureDimensions/08753d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/08753d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl b/test/tint/builtins/gen/textureDimensions/0c4772.wgsl
index 6dd8a79dcc..42af723c53 100644
--- a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0c4772.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl b/test/tint/builtins/gen/textureDimensions/0cce40.wgsl
index 4c14203427..cb527a915c 100644
--- a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0cce40.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl b/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
index f52c1a61b7..738123f22b 100644
--- a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl b/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
index 2688d8312e..19b92f6a77 100644
--- a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl b/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
index 3e9df2c862..8a368163fa 100644
--- a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl b/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
index 11a3f9af3a..17a8ef1599 100644
--- a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl b/test/tint/builtins/gen/textureDimensions/1191a5.wgsl
index 4dc1a0574b..ad3dab85c4 100644
--- a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1191a5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl b/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
index fad46f83df..f292f6dc55 100644
--- a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl b/test/tint/builtins/gen/textureDimensions/147998.wgsl
index 801354ff48..5acc4c1536 100644
--- a/test/tint/builtins/gen/textureDimensions/147998.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/147998.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl b/test/tint/builtins/gen/textureDimensions/16036c.wgsl
index 31caead368..dbaa1deb61 100644
--- a/test/tint/builtins/gen/textureDimensions/16036c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/16036c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl b/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
index f16a46791a..daa39542b5 100644
--- a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl b/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
index 9aef149939..428f5ed009 100644
--- a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl b/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
index bd05eecac0..17be4e0120 100644
--- a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl b/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
index 73fca6f7b9..6598efbe51 100644
--- a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl b/test/tint/builtins/gen/textureDimensions/214dd4.wgsl
index f06b7795ed..b462c702c0 100644
--- a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/214dd4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl b/test/tint/builtins/gen/textureDimensions/221f22.wgsl
index 3b798f4a93..8b3835af27 100644
--- a/test/tint/builtins/gen/textureDimensions/221f22.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/221f22.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl b/test/tint/builtins/gen/textureDimensions/267788.wgsl
index 03db51c014..a90cd8148e 100644
--- a/test/tint/builtins/gen/textureDimensions/267788.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/267788.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl b/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
index de93de7af6..6f4278baf6 100644
--- a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl b/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
index e4c00a8590..45a5004ed9 100644
--- a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl b/test/tint/builtins/gen/textureDimensions/2ad087.wgsl
index 0a409cb81f..b26368dc73 100644
--- a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2ad087.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl b/test/tint/builtins/gen/textureDimensions/2efa05.wgsl
index f675b2a5a8..8989190b51 100644
--- a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2efa05.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl b/test/tint/builtins/gen/textureDimensions/2f289f.wgsl
index 31b274bf0b..bb5a07f3f3 100644
--- a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2f289f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl b/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
index fffa5ef7fe..4b3ebb548d 100644
--- a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl b/test/tint/builtins/gen/textureDimensions/318ecc.wgsl
index e1ac7cede3..88f0459124 100644
--- a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/318ecc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl b/test/tint/builtins/gen/textureDimensions/340d06.wgsl
index d6ac699fbb..aa5d78eba8 100644
--- a/test/tint/builtins/gen/textureDimensions/340d06.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/340d06.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl b/test/tint/builtins/gen/textureDimensions/398e30.wgsl
index 416d6a10f4..ba00534176 100644
--- a/test/tint/builtins/gen/textureDimensions/398e30.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/398e30.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl b/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
index 933c78c907..b0083331be 100644
--- a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl b/test/tint/builtins/gen/textureDimensions/3aca08.wgsl
index 9661ae0ca2..de36f08505 100644
--- a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/3aca08.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl b/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
index 2b12ec8936..63398de6fe 100644
--- a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl b/test/tint/builtins/gen/textureDimensions/4152a6.wgsl
index 77336b5a1d..a8ee80ce67 100644
--- a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/4152a6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl b/test/tint/builtins/gen/textureDimensions/423f99.wgsl
index f08084fef9..8029171004 100644
--- a/test/tint/builtins/gen/textureDimensions/423f99.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/423f99.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl b/test/tint/builtins/gen/textureDimensions/4267ee.wgsl
index de5c300340..1596f1c809 100644
--- a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/4267ee.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl b/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
index dc40509759..06b887ad06 100644
--- a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl b/test/tint/builtins/gen/textureDimensions/48cb89.wgsl
index dc66bf575b..25deb1bb0c 100644
--- a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/48cb89.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl b/test/tint/builtins/gen/textureDimensions/49d274.wgsl
index 5fbacdf25b..37783cf96a 100644
--- a/test/tint/builtins/gen/textureDimensions/49d274.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/49d274.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl b/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
index 1597c8df1b..c5ea5dd0eb 100644
--- a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl b/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
index af4ba9ff89..eefaaf8539 100644
--- a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl b/test/tint/builtins/gen/textureDimensions/52045c.wgsl
index cd248aef0d..e31d6be353 100644
--- a/test/tint/builtins/gen/textureDimensions/52045c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/52045c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl b/test/tint/builtins/gen/textureDimensions/55b23e.wgsl
index ef9278a5c2..82cc5664aa 100644
--- a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/55b23e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl b/test/tint/builtins/gen/textureDimensions/579629.wgsl
index 67c7425c9a..49e35e3ffa 100644
--- a/test/tint/builtins/gen/textureDimensions/579629.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/579629.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl b/test/tint/builtins/gen/textureDimensions/57da0b.wgsl
index b33c892666..bf57595617 100644
--- a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/57da0b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl b/test/tint/builtins/gen/textureDimensions/57e28f.wgsl
index ee86198946..d782714f4d 100644
--- a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/57e28f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl b/test/tint/builtins/gen/textureDimensions/58a515.wgsl
index 5b436319a4..1f024d4a8f 100644
--- a/test/tint/builtins/gen/textureDimensions/58a515.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/58a515.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl b/test/tint/builtins/gen/textureDimensions/5985f3.wgsl
index 3db373de3c..ba79f20a83 100644
--- a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/5985f3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl b/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
index 7519fd7d48..bc26c57c7c 100644
--- a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl b/test/tint/builtins/gen/textureDimensions/5e295d.wgsl
index 2feb748436..ed4854d3f7 100644
--- a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/5e295d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl b/test/tint/builtins/gen/textureDimensions/60bf54.wgsl
index 40adfcdd9a..1838e87158 100644
--- a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/60bf54.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl b/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
index 93dc8b91f0..b997655052 100644
--- a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl b/test/tint/builtins/gen/textureDimensions/68105c.wgsl
index b129e2b16e..c3ab22330f 100644
--- a/test/tint/builtins/gen/textureDimensions/68105c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/68105c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl b/test/tint/builtins/gen/textureDimensions/686ef2.wgsl
index 11d39e7351..36f10f4fa0 100644
--- a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/686ef2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl b/test/tint/builtins/gen/textureDimensions/6adac6.wgsl
index 035e9f8368..4d454d13f0 100644
--- a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/6adac6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl b/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
index 12ae43f22e..71ea69ea1b 100644
--- a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl b/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
index 910d9012c2..0be50aa52f 100644
--- a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl b/test/tint/builtins/gen/textureDimensions/702c53.wgsl
index 97f4f85125..7b217b35bf 100644
--- a/test/tint/builtins/gen/textureDimensions/702c53.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/702c53.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl b/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
index cb9953aa8c..ba2e7b00d1 100644
--- a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl b/test/tint/builtins/gen/textureDimensions/79df87.wgsl
index 8994e92a10..2c05574653 100644
--- a/test/tint/builtins/gen/textureDimensions/79df87.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/79df87.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl b/test/tint/builtins/gen/textureDimensions/7bf826.wgsl
index 53a138fed8..6a2f24a8ee 100644
--- a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/7bf826.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl b/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
index 50d3225d85..18bce03db4 100644
--- a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl b/test/tint/builtins/gen/textureDimensions/8028f3.wgsl
index 95622d83e1..b67521333e 100644
--- a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8028f3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl b/test/tint/builtins/gen/textureDimensions/811679.wgsl
index 1aa8dede61..9223f56065 100644
--- a/test/tint/builtins/gen/textureDimensions/811679.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/811679.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl b/test/tint/builtins/gen/textureDimensions/820596.wgsl
index 814c19f34d..a6ff78299e 100644
--- a/test/tint/builtins/gen/textureDimensions/820596.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/820596.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl b/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
index eeaa4f1935..3ac74e8222 100644
--- a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl b/test/tint/builtins/gen/textureDimensions/85d556.wgsl
index 3c58ad8ef0..628e35c92b 100644
--- a/test/tint/builtins/gen/textureDimensions/85d556.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/85d556.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl b/test/tint/builtins/gen/textureDimensions/88ad17.wgsl
index b2401be2cd..79eef6f98e 100644
--- a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/88ad17.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl b/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
index 781a0b4764..4dd29cf257 100644
--- a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl b/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
index 8f603fe5ed..d885845bb8 100644
--- a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl b/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
index 3c315b3ef9..1af7247a8d 100644
--- a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl b/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
index 32c1ee2883..a7cd8cf791 100644
--- a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl b/test/tint/builtins/gen/textureDimensions/90340b.wgsl
index cdfd3c1173..842621eb48 100644
--- a/test/tint/builtins/gen/textureDimensions/90340b.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/90340b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl b/test/tint/builtins/gen/textureDimensions/9042ab.wgsl
index 815b3a3cd7..fbdaabe363 100644
--- a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9042ab.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl b/test/tint/builtins/gen/textureDimensions/9393b0.wgsl
index 8d3a4d4aa7..0f6af45b3c 100644
--- a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9393b0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl b/test/tint/builtins/gen/textureDimensions/939fdb.wgsl
index 1fb04e3c15..591453207a 100644
--- a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/939fdb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl b/test/tint/builtins/gen/textureDimensions/962dcd.wgsl
index 0efc3949bc..5f248250c6 100644
--- a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/962dcd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl b/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
index 0f0a5f691c..08c18fd6e8 100644
--- a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl b/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
index 3469b127a7..1ea3761b12 100644
--- a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl b/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
index 72d2a8f3a1..96b2672b66 100644
--- a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl b/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
index 14df0a4a41..c2805cfbcf 100644
--- a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl b/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
index 84e17906d4..810ecd5349 100644
--- a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl b/test/tint/builtins/gen/textureDimensions/a01845.wgsl
index 6c5c3b8652..a3e1c14f09 100644
--- a/test/tint/builtins/gen/textureDimensions/a01845.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a01845.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl b/test/tint/builtins/gen/textureDimensions/a7d565.wgsl
index 6062dade77..904dbce36e 100644
--- a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a7d565.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl b/test/tint/builtins/gen/textureDimensions/a863f2.wgsl
index b406745bb3..6b5fdac25e 100644
--- a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a863f2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl b/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
index 2f9f45607d..19cd6e114a 100644
--- a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl b/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
index 975ed3e12e..4b25df8e85 100644
--- a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl b/test/tint/builtins/gen/textureDimensions/b3c954.wgsl
index 32431dfca1..588af6c824 100644
--- a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b3c954.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl b/test/tint/builtins/gen/textureDimensions/b3e407.wgsl
index 541b20fb79..1c04110216 100644
--- a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b3e407.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl b/test/tint/builtins/gen/textureDimensions/b91240.wgsl
index 2b0618f9a3..4c8707c1fa 100644
--- a/test/tint/builtins/gen/textureDimensions/b91240.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b91240.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl b/test/tint/builtins/gen/textureDimensions/ba1481.wgsl
index c748cd4a8c..521e1cecb7 100644
--- a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/ba1481.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl b/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
index 106e673790..b37b33e029 100644
--- a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl b/test/tint/builtins/gen/textureDimensions/c30e75.wgsl
index 64589a158f..d16d53858a 100644
--- a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/c30e75.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl b/test/tint/builtins/gen/textureDimensions/c7943d.wgsl
index 045d675e47..73cb2ca487 100644
--- a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/c7943d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl b/test/tint/builtins/gen/textureDimensions/cc968c.wgsl
index 5cac06a8ad..89e96200e1 100644
--- a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cc968c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl b/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
index a29f56d54c..a0738bccd5 100644
--- a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl b/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
index 698f80160e..3bce5a61d3 100644
--- a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl b/test/tint/builtins/gen/textureDimensions/cdf473.wgsl
index 84845553f3..db67b124ee 100644
--- a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cdf473.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl b/test/tint/builtins/gen/textureDimensions/cec841.wgsl
index 27a00d805e..29e5903f71 100644
--- a/test/tint/builtins/gen/textureDimensions/cec841.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cec841.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl b/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
index aef9ce244b..bd8e0bb856 100644
--- a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl b/test/tint/builtins/gen/textureDimensions/d125bc.wgsl
index d9b9b75f34..d01cb3593b 100644
--- a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/d125bc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl b/test/tint/builtins/gen/textureDimensions/d83c45.wgsl
index f1547b429c..0cf89206f2 100644
--- a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/d83c45.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl b/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
index 1abea43b85..b7207bd29f 100644
--- a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl b/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
index ce71a036b9..bd87d0c39a 100644
--- a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl b/test/tint/builtins/gen/textureDimensions/e927be.wgsl
index b868f85a01..1deab90e96 100644
--- a/test/tint/builtins/gen/textureDimensions/e927be.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/e927be.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl b/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
index 095d3de74a..f0967abc72 100644
--- a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl b/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
index bc5d8d1335..5526818bf9 100644
--- a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl b/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
index d7492fc198..382191f596 100644
--- a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl b/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
index dec639ccdc..496b024840 100644
--- a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl b/test/tint/builtins/gen/textureDimensions/f7145b.wgsl
index 2d6573d23d..0c2834eee2 100644
--- a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/f7145b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl b/test/tint/builtins/gen/textureDimensions/f931c7.wgsl
index ce008b84e9..6dcbc80cf5 100644
--- a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/f931c7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl b/test/tint/builtins/gen/textureDimensions/fa9859.wgsl
index b37414dd48..7c3d137d3f 100644
--- a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/fa9859.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl b/test/tint/builtins/gen/textureDimensions/fb5670.wgsl
index de55708829..73aa7aa875 100644
--- a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/fb5670.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl b/test/tint/builtins/gen/textureDimensions/fcac78.wgsl
index e5a3cdc38c..8f5c0f0c9e 100644
--- a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/fcac78.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl b/test/tint/builtins/gen/textureGather/01305f.wgsl
index 3998267df5..fdb193f480 100644
--- a/test/tint/builtins/gen/textureGather/01305f.wgsl
+++ b/test/tint/builtins/gen/textureGather/01305f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl b/test/tint/builtins/gen/textureGather/06030a.wgsl
index d7c86c5aaf..b2caaed434 100644
--- a/test/tint/builtins/gen/textureGather/06030a.wgsl
+++ b/test/tint/builtins/gen/textureGather/06030a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl b/test/tint/builtins/gen/textureGather/10c554.wgsl
index 4261dde489..28e958b3b8 100644
--- a/test/tint/builtins/gen/textureGather/10c554.wgsl
+++ b/test/tint/builtins/gen/textureGather/10c554.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl b/test/tint/builtins/gen/textureGather/15d79c.wgsl
index 65b7d82b90..37b88a0f3e 100644
--- a/test/tint/builtins/gen/textureGather/15d79c.wgsl
+++ b/test/tint/builtins/gen/textureGather/15d79c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl b/test/tint/builtins/gen/textureGather/2e0ed5.wgsl
index fccd2a9da6..4b4d5bc297 100644
--- a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl
+++ b/test/tint/builtins/gen/textureGather/2e0ed5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl b/test/tint/builtins/gen/textureGather/3112e8.wgsl
index 26dcca81e1..cde5dd48cd 100644
--- a/test/tint/builtins/gen/textureGather/3112e8.wgsl
+++ b/test/tint/builtins/gen/textureGather/3112e8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl b/test/tint/builtins/gen/textureGather/3c527e.wgsl
index 52f907394e..533374898e 100644
--- a/test/tint/builtins/gen/textureGather/3c527e.wgsl
+++ b/test/tint/builtins/gen/textureGather/3c527e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl b/test/tint/builtins/gen/textureGather/43025d.wgsl
index 61bd9662ae..39681aa8a3 100644
--- a/test/tint/builtins/gen/textureGather/43025d.wgsl
+++ b/test/tint/builtins/gen/textureGather/43025d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl b/test/tint/builtins/gen/textureGather/4f2350.wgsl
index 4f2ea5fadf..27cb542892 100644
--- a/test/tint/builtins/gen/textureGather/4f2350.wgsl
+++ b/test/tint/builtins/gen/textureGather/4f2350.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl b/test/tint/builtins/gen/textureGather/51cf0b.wgsl
index 9899ff76be..3b42e5d682 100644
--- a/test/tint/builtins/gen/textureGather/51cf0b.wgsl
+++ b/test/tint/builtins/gen/textureGather/51cf0b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl b/test/tint/builtins/gen/textureGather/53ece6.wgsl
index 242a1fe270..fff75b65b0 100644
--- a/test/tint/builtins/gen/textureGather/53ece6.wgsl
+++ b/test/tint/builtins/gen/textureGather/53ece6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl b/test/tint/builtins/gen/textureGather/57bfc6.wgsl
index c9c7185d07..66ab90855f 100644
--- a/test/tint/builtins/gen/textureGather/57bfc6.wgsl
+++ b/test/tint/builtins/gen/textureGather/57bfc6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl b/test/tint/builtins/gen/textureGather/587ba3.wgsl
index 4b20c2441e..36138e250d 100644
--- a/test/tint/builtins/gen/textureGather/587ba3.wgsl
+++ b/test/tint/builtins/gen/textureGather/587ba3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl b/test/tint/builtins/gen/textureGather/69e0fb.wgsl
index be794c58f5..eefd1764b8 100644
--- a/test/tint/builtins/gen/textureGather/69e0fb.wgsl
+++ b/test/tint/builtins/gen/textureGather/69e0fb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl b/test/tint/builtins/gen/textureGather/93003d.wgsl
index 0f5b7bd9e0..2d1a14fda0 100644
--- a/test/tint/builtins/gen/textureGather/93003d.wgsl
+++ b/test/tint/builtins/gen/textureGather/93003d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl b/test/tint/builtins/gen/textureGather/9a6358.wgsl
index a5682c4dd8..fe03e14b0d 100644
--- a/test/tint/builtins/gen/textureGather/9a6358.wgsl
+++ b/test/tint/builtins/gen/textureGather/9a6358.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl b/test/tint/builtins/gen/textureGather/9efca2.wgsl
index dd8a24cb1f..01173de9db 100644
--- a/test/tint/builtins/gen/textureGather/9efca2.wgsl
+++ b/test/tint/builtins/gen/textureGather/9efca2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl b/test/tint/builtins/gen/textureGather/bd0b1e.wgsl
index b6c67b4d43..eff100dad2 100644
--- a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl
+++ b/test/tint/builtins/gen/textureGather/bd0b1e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl b/test/tint/builtins/gen/textureGather/c409ae.wgsl
index 613eb8fd8f..5ce164326c 100644
--- a/test/tint/builtins/gen/textureGather/c409ae.wgsl
+++ b/test/tint/builtins/gen/textureGather/c409ae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl b/test/tint/builtins/gen/textureGather/c55822.wgsl
index 4f2cf185de..7c60b3ea51 100644
--- a/test/tint/builtins/gen/textureGather/c55822.wgsl
+++ b/test/tint/builtins/gen/textureGather/c55822.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl b/test/tint/builtins/gen/textureGather/e1b67d.wgsl
index 7dda59d12c..1745a44e20 100644
--- a/test/tint/builtins/gen/textureGather/e1b67d.wgsl
+++ b/test/tint/builtins/gen/textureGather/e1b67d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl b/test/tint/builtins/gen/textureGather/e9eff6.wgsl
index b15f8d9e89..cc3356e5c1 100644
--- a/test/tint/builtins/gen/textureGather/e9eff6.wgsl
+++ b/test/tint/builtins/gen/textureGather/e9eff6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl b/test/tint/builtins/gen/textureGather/f5f3ba.wgsl
index cda403954d..739a99be02 100644
--- a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl
+++ b/test/tint/builtins/gen/textureGather/f5f3ba.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl b/test/tint/builtins/gen/textureGather/f7995a.wgsl
index aeb9e1eef7..ef2624f428 100644
--- a/test/tint/builtins/gen/textureGather/f7995a.wgsl
+++ b/test/tint/builtins/gen/textureGather/f7995a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl b/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
index 0d7cbeee24..90ba7db910 100644
--- a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl b/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
index c92cd8a56a..4fe0fc719a 100644
--- a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl b/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
index 6fcd8084c1..e58b3776fb 100644
--- a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl b/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
index cf019087a7..b3b015d91e 100644
--- a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl b/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
index a4238f710e..cb6fb6d343 100644
--- a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl b/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
index ff7a2d3318..3a2d011291 100644
--- a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl b/test/tint/builtins/gen/textureLoad/19cf87.wgsl
index fe204c43bc..be3267a268 100644
--- a/test/tint/builtins/gen/textureLoad/19cf87.wgsl
+++ b/test/tint/builtins/gen/textureLoad/19cf87.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl b/test/tint/builtins/gen/textureLoad/1b8588.wgsl
index 161abf5b31..f83d3bc541 100644
--- a/test/tint/builtins/gen/textureLoad/1b8588.wgsl
+++ b/test/tint/builtins/gen/textureLoad/1b8588.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl b/test/tint/builtins/gen/textureLoad/1f2016.wgsl
index 58f3e49230..078f87b97d 100644
--- a/test/tint/builtins/gen/textureLoad/1f2016.wgsl
+++ b/test/tint/builtins/gen/textureLoad/1f2016.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl b/test/tint/builtins/gen/textureLoad/484344.wgsl
index 7ce3c74475..498efdae0a 100644
--- a/test/tint/builtins/gen/textureLoad/484344.wgsl
+++ b/test/tint/builtins/gen/textureLoad/484344.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl b/test/tint/builtins/gen/textureLoad/4fd803.wgsl
index edf3d4ecde..9d60c2526e 100644
--- a/test/tint/builtins/gen/textureLoad/4fd803.wgsl
+++ b/test/tint/builtins/gen/textureLoad/4fd803.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl b/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
index 0e8a1c99a4..1f1e1e1f12 100644
--- a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
+++ b/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl b/test/tint/builtins/gen/textureLoad/6154d4.wgsl
index 535d518b2b..6078b2d2ad 100644
--- a/test/tint/builtins/gen/textureLoad/6154d4.wgsl
+++ b/test/tint/builtins/gen/textureLoad/6154d4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl b/test/tint/builtins/gen/textureLoad/6273b1.wgsl
index 469ccaff8e..0bc163feb2 100644
--- a/test/tint/builtins/gen/textureLoad/6273b1.wgsl
+++ b/test/tint/builtins/gen/textureLoad/6273b1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl b/test/tint/builtins/gen/textureLoad/79e697.wgsl
index 0894fcc1ad..195a489083 100644
--- a/test/tint/builtins/gen/textureLoad/79e697.wgsl
+++ b/test/tint/builtins/gen/textureLoad/79e697.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl b/test/tint/builtins/gen/textureLoad/7c90e5.wgsl
index ee7d6d802d..231d9c5791 100644
--- a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl
+++ b/test/tint/builtins/gen/textureLoad/7c90e5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl b/test/tint/builtins/gen/textureLoad/81c381.wgsl
index b96d812d0b..b68c0ded8e 100644
--- a/test/tint/builtins/gen/textureLoad/81c381.wgsl
+++ b/test/tint/builtins/gen/textureLoad/81c381.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl b/test/tint/builtins/gen/textureLoad/87be85.wgsl
index 493b22389a..1440343b4a 100644
--- a/test/tint/builtins/gen/textureLoad/87be85.wgsl
+++ b/test/tint/builtins/gen/textureLoad/87be85.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl b/test/tint/builtins/gen/textureLoad/8acf41.wgsl
index 32f8d7aa78..25aff6cce5 100644
--- a/test/tint/builtins/gen/textureLoad/8acf41.wgsl
+++ b/test/tint/builtins/gen/textureLoad/8acf41.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl b/test/tint/builtins/gen/textureLoad/9b2667.wgsl
index 363dd81777..73c2c3177c 100644
--- a/test/tint/builtins/gen/textureLoad/9b2667.wgsl
+++ b/test/tint/builtins/gen/textureLoad/9b2667.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl b/test/tint/builtins/gen/textureLoad/a583c9.wgsl
index 1edbd2bd0e..9ed4ae7e07 100644
--- a/test/tint/builtins/gen/textureLoad/a583c9.wgsl
+++ b/test/tint/builtins/gen/textureLoad/a583c9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl b/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
index c46c2e9095..095314d15d 100644
--- a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
+++ b/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl b/test/tint/builtins/gen/textureLoad/c2a480.wgsl
index 3d7ba91c70..b3ebdccef4 100644
--- a/test/tint/builtins/gen/textureLoad/c2a480.wgsl
+++ b/test/tint/builtins/gen/textureLoad/c2a480.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl b/test/tint/builtins/gen/textureLoad/c378ee.wgsl
index 50b6a75011..4d56e20dae 100644
--- a/test/tint/builtins/gen/textureLoad/c378ee.wgsl
+++ b/test/tint/builtins/gen/textureLoad/c378ee.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl b/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
index 22314e3dee..1a097e7b25 100644
--- a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
+++ b/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl b/test/tint/builtins/gen/textureNumLayers/024820.wgsl
index f0435dfe26..99a5031fa2 100644
--- a/test/tint/builtins/gen/textureNumLayers/024820.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/024820.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl b/test/tint/builtins/gen/textureNumLayers/053df7.wgsl
index d6091ab29d..9595a93f38 100644
--- a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/053df7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl b/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
index 48ac7cefdb..fe750568ee 100644
--- a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl b/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
index 5dc0761a9b..9e8fd7c1a5 100644
--- a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl b/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
index af05038cff..941d8f6aa6 100644
--- a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl b/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
index 9a78274389..e2c96d742a 100644
--- a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl b/test/tint/builtins/gen/textureNumLayers/562013.wgsl
index 3c3a749b27..aac18a1c47 100644
--- a/test/tint/builtins/gen/textureNumLayers/562013.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/562013.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl b/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
index 23b022feb6..edf197ff17 100644
--- a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl b/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
index 18c9fe819f..6743ff5fe3 100644
--- a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl b/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
index f2a4a1d56a..2574c2af03 100644
--- a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl b/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
index 3f7fae997f..ed7014f4d1 100644
--- a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl b/test/tint/builtins/gen/textureNumLayers/85f980.wgsl
index 229e7dc86e..e01f5769de 100644
--- a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/85f980.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl b/test/tint/builtins/gen/textureNumLayers/87953e.wgsl
index 8f83d9374c..00db05ea76 100644
--- a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/87953e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl b/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
index 57694680c0..3b58ba3dc1 100644
--- a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl b/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
index 92809e62b6..d02558bbeb 100644
--- a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl b/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
index 6a413b4520..1bf60ba39f 100644
--- a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl b/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
index 81b90c183a..af6c708665 100644
--- a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl b/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
index 82a57bb0d2..df5ccbd2c3 100644
--- a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl b/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
index 38398a8683..a7f2c8ca09 100644
--- a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl b/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
index 23e103fb76..cb9d362880 100644
--- a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl b/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
index 76f9e16372..5ebae3d73e 100644
--- a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl b/test/tint/builtins/gen/textureNumLayers/f33005.wgsl
index 9d320545ac..d12cb268ea 100644
--- a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/f33005.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl b/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
index a8d6006b37..e99f0753a3 100644
--- a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl b/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
index c30691bde2..3d50b4fced 100644
--- a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl b/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
index 5d1c2a8d54..63b7ea4cea 100644
--- a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl b/test/tint/builtins/gen/textureNumLevels/080d95.wgsl
index d6456efdf6..ded52c9a96 100644
--- a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/080d95.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl b/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
index 7bee67a329..e843a19449 100644
--- a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl b/test/tint/builtins/gen/textureNumLevels/105988.wgsl
index 65504ed124..0014fa3efd 100644
--- a/test/tint/builtins/gen/textureNumLevels/105988.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/105988.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl b/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
index 9edd5e5aa1..2dc92a3a30 100644
--- a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl b/test/tint/builtins/gen/textureNumLevels/23f750.wgsl
index dff448d60c..20719fc925 100644
--- a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/23f750.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl b/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
index 43da5e9f3f..c0db1ad608 100644
--- a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl b/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
index 5eae1b0992..d83db338d5 100644
--- a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl b/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
index 24cd1a67d7..e9cb59fa91 100644
--- a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl b/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
index 605689d4c9..cad28463af 100644
--- a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl b/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
index e2528d4005..edf861312c 100644
--- a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl b/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
index c3f93f36ed..3e3a657794 100644
--- a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl b/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
index 4cdd6c21dc..212372cdd6 100644
--- a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl b/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
index 9f56e1415c..a1ec36dafb 100644
--- a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl b/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
index 018e54b6af..afc20a1773 100644
--- a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl b/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
index b6451eb097..3b2ecf56ab 100644
--- a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl b/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
index a78bb401b8..8386de5a5c 100644
--- a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl b/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
index 84b5e9ae2c..2b52ef0bcf 100644
--- a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl b/test/tint/builtins/gen/textureNumLevels/e67231.wgsl
index 4461005af2..f718b8ef6c 100644
--- a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/e67231.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl b/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
index 9af28095f5..7bd2ff2dea 100644
--- a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl b/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
index 97dfad0fa1..05d8294a93 100644
--- a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl b/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
index cbe606ebc7..b608fff061 100644
--- a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl b/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
index a7ebd78508..3be8ac4387 100644
--- a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl b/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
index af4e0c88f3..05af08671a 100644
--- a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl b/test/tint/builtins/gen/textureNumSamples/449d23.wgsl
index af493296f1..d0f5b5c1cb 100644
--- a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/449d23.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl b/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
index 2e54a686ea..3599955e1b 100644
--- a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl b/test/tint/builtins/gen/textureSample/02aa9b.wgsl
index 03b397e031..e392604f62 100644
--- a/test/tint/builtins/gen/textureSample/02aa9b.wgsl
+++ b/test/tint/builtins/gen/textureSample/02aa9b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl b/test/tint/builtins/gen/textureSample/100dc0.wgsl
index e9ba3d2926..89ecf17588 100644
--- a/test/tint/builtins/gen/textureSample/100dc0.wgsl
+++ b/test/tint/builtins/gen/textureSample/100dc0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl b/test/tint/builtins/gen/textureSample/38bbb9.wgsl
index 6791e57c97..3174564f99 100644
--- a/test/tint/builtins/gen/textureSample/38bbb9.wgsl
+++ b/test/tint/builtins/gen/textureSample/38bbb9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl b/test/tint/builtins/gen/textureSample/3b50bd.wgsl
index a15b4135d0..f0ee1c54da 100644
--- a/test/tint/builtins/gen/textureSample/3b50bd.wgsl
+++ b/test/tint/builtins/gen/textureSample/3b50bd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl b/test/tint/builtins/gen/textureSample/4dd1bf.wgsl
index 12f4695e96..508775aa10 100644
--- a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl
+++ b/test/tint/builtins/gen/textureSample/4dd1bf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl b/test/tint/builtins/gen/textureSample/51b514.wgsl
index 21af2038ce..47f972c504 100644
--- a/test/tint/builtins/gen/textureSample/51b514.wgsl
+++ b/test/tint/builtins/gen/textureSample/51b514.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl b/test/tint/builtins/gen/textureSample/667d76.wgsl
index 26ae96ce9e..f4d62ddfb4 100644
--- a/test/tint/builtins/gen/textureSample/667d76.wgsl
+++ b/test/tint/builtins/gen/textureSample/667d76.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl b/test/tint/builtins/gen/textureSample/6717ca.wgsl
index 2006a02661..4180ea0ed7 100644
--- a/test/tint/builtins/gen/textureSample/6717ca.wgsl
+++ b/test/tint/builtins/gen/textureSample/6717ca.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl b/test/tint/builtins/gen/textureSample/6e64fb.wgsl
index c1361ff49c..92ec8555da 100644
--- a/test/tint/builtins/gen/textureSample/6e64fb.wgsl
+++ b/test/tint/builtins/gen/textureSample/6e64fb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl b/test/tint/builtins/gen/textureSample/7c3baa.wgsl
index 20ce74f6fb..14d09e4512 100644
--- a/test/tint/builtins/gen/textureSample/7c3baa.wgsl
+++ b/test/tint/builtins/gen/textureSample/7c3baa.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl b/test/tint/builtins/gen/textureSample/7e9ffd.wgsl
index cf1c461142..15c221cf2d 100644
--- a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl
+++ b/test/tint/builtins/gen/textureSample/7e9ffd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl b/test/tint/builtins/gen/textureSample/8522e7.wgsl
index 6ee81a05fd..d82c289cd2 100644
--- a/test/tint/builtins/gen/textureSample/8522e7.wgsl
+++ b/test/tint/builtins/gen/textureSample/8522e7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl b/test/tint/builtins/gen/textureSample/c2f4e8.wgsl
index 49dbe3ed54..b577d22053 100644
--- a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl
+++ b/test/tint/builtins/gen/textureSample/c2f4e8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl b/test/tint/builtins/gen/textureSample/e53267.wgsl
index b077c25763..39add1398c 100644
--- a/test/tint/builtins/gen/textureSample/e53267.wgsl
+++ b/test/tint/builtins/gen/textureSample/e53267.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl b/test/tint/builtins/gen/textureSample/ea7030.wgsl
index 2181147909..ebd9e50c57 100644
--- a/test/tint/builtins/gen/textureSample/ea7030.wgsl
+++ b/test/tint/builtins/gen/textureSample/ea7030.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl b/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
index 8a7c89e22c..18c60e7d67 100644
--- a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl b/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
index 22ff16fe30..42615671b3 100644
--- a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl b/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
index 113e850421..8366a13ac7 100644
--- a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl b/test/tint/builtins/gen/textureSampleBias/80e579.wgsl
index 469728820e..bdf66214f7 100644
--- a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/80e579.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl b/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
index 8335655396..1404fe96e8 100644
--- a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl b/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
index cfcf277039..c35677ced3 100644
--- a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl b/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
index 0c8f85f5d7..0232d0aa52 100644
--- a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl b/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
index 79d07799df..bbc1ad7de6 100644
--- a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl b/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
index a222cac96b..a5b48036c9 100644
--- a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl b/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
index 2e1e031485..7c8fda5e7b 100644
--- a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl b/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
index 243c949a89..163731a766 100644
--- a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl b/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
index 3e6d0e75b1..a21c6e9659 100644
--- a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl b/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
index 1280d26f05..24aa9b5b4f 100644
--- a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl b/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
index b32334208b..53015a42bf 100644
--- a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
index c764ab537a..a6fa885a8b 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
index adb02445e5..126cedc97a 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
index 315f06a5e6..1525450b32 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
index f6b37a548c..b03768d3e1 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
index 26ac0e0064..46931cbd12 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
index 1635329ed2..50fbbe1fdf 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl b/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
index f55d52e2d0..ca02ceee79 100644
--- a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl b/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
index de0f36ce2b..b68b12e4ab 100644
--- a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl b/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
index 5e35642ed1..a15d5446fe 100644
--- a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl b/test/tint/builtins/gen/textureSampleGrad/521263.wgsl
index 2cf79b5091..37946854bb 100644
--- a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/521263.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl b/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
index 16d60ef023..03e79302a5 100644
--- a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl b/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
index ed633d805a..13fa7379bd 100644
--- a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl b/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
index ee940f8967..4e2e62ae24 100644
--- a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl b/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
index 934299e460..0b0c659ca0 100644
--- a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl b/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
index d644dd63ce..6bce2c61bc 100644
--- a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl b/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
index b9b46cb5f9..f4b34fec6b 100644
--- a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl b/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
index 95e2acee76..307442c215 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl b/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
index aadcb613aa..b32ce00f94 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl b/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
index de528ee08f..fb1df7c65d 100644
--- a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl b/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
index 1745cfd5bf..b7d0ced426 100644
--- a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl b/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
index d8852014b8..4d3d865f62 100644
--- a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl b/test/tint/builtins/gen/textureSampleLevel/979816.wgsl
index 15c68a3295..17345bb5d1 100644
--- a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/979816.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl b/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
index 3bf97beb07..6620b3138b 100644
--- a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl b/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
index 9e9ecfec5f..dc7ae8cc3e 100644
--- a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl b/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
index 26c7932dfd..1ee0d7a0f0 100644
--- a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl b/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
index 5b328aa514..b5a132353b 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl b/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
index ee6cd52373..6c4178e0fd 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl b/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
index a3724dfb61..16ef52b815 100644
--- a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl b/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
index 97b4cdd495..8a5a47f024 100644
--- a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl b/test/tint/builtins/gen/textureStore/05ce15.wgsl
index 52dc74748e..88fb6bd546 100644
--- a/test/tint/builtins/gen/textureStore/05ce15.wgsl
+++ b/test/tint/builtins/gen/textureStore/05ce15.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl b/test/tint/builtins/gen/textureStore/064c7f.wgsl
index e4d7b7d561..411a952f13 100644
--- a/test/tint/builtins/gen/textureStore/064c7f.wgsl
+++ b/test/tint/builtins/gen/textureStore/064c7f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl b/test/tint/builtins/gen/textureStore/068641.wgsl
index 706d59d7b7..b8b50f4e9b 100644
--- a/test/tint/builtins/gen/textureStore/068641.wgsl
+++ b/test/tint/builtins/gen/textureStore/068641.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl b/test/tint/builtins/gen/textureStore/0af6b5.wgsl
index b40da90642..d58fe96ca1 100644
--- a/test/tint/builtins/gen/textureStore/0af6b5.wgsl
+++ b/test/tint/builtins/gen/textureStore/0af6b5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl b/test/tint/builtins/gen/textureStore/0c3dff.wgsl
index 33d518903f..6320997251 100644
--- a/test/tint/builtins/gen/textureStore/0c3dff.wgsl
+++ b/test/tint/builtins/gen/textureStore/0c3dff.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl b/test/tint/builtins/gen/textureStore/102722.wgsl
index e3999df2dd..845511824c 100644
--- a/test/tint/builtins/gen/textureStore/102722.wgsl
+++ b/test/tint/builtins/gen/textureStore/102722.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl b/test/tint/builtins/gen/textureStore/1bbd08.wgsl
index 0346b611da..2537d612d9 100644
--- a/test/tint/builtins/gen/textureStore/1bbd08.wgsl
+++ b/test/tint/builtins/gen/textureStore/1bbd08.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl b/test/tint/builtins/gen/textureStore/1c02e7.wgsl
index 42e48c34a8..c1dc4146e7 100644
--- a/test/tint/builtins/gen/textureStore/1c02e7.wgsl
+++ b/test/tint/builtins/gen/textureStore/1c02e7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl b/test/tint/builtins/gen/textureStore/22d955.wgsl
index cf7e86ba51..fd3f3ce2fb 100644
--- a/test/tint/builtins/gen/textureStore/22d955.wgsl
+++ b/test/tint/builtins/gen/textureStore/22d955.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl b/test/tint/builtins/gen/textureStore/26bf70.wgsl
index 7bc2362709..1610dec258 100644
--- a/test/tint/builtins/gen/textureStore/26bf70.wgsl
+++ b/test/tint/builtins/gen/textureStore/26bf70.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl b/test/tint/builtins/gen/textureStore/2796b4.wgsl
index 698c4e70f3..f8376a714c 100644
--- a/test/tint/builtins/gen/textureStore/2796b4.wgsl
+++ b/test/tint/builtins/gen/textureStore/2796b4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl b/test/tint/builtins/gen/textureStore/2ac6c7.wgsl
index 6bc41e1c04..030b84b39b 100644
--- a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl
+++ b/test/tint/builtins/gen/textureStore/2ac6c7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl b/test/tint/builtins/gen/textureStore/2eb2a4.wgsl
index 6f216ae751..56d3c7377b 100644
--- a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl
+++ b/test/tint/builtins/gen/textureStore/2eb2a4.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl b/test/tint/builtins/gen/textureStore/2ed2a3.wgsl
index f4493b3ece..f86ec1f322 100644
--- a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl
+++ b/test/tint/builtins/gen/textureStore/2ed2a3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl b/test/tint/builtins/gen/textureStore/31745b.wgsl
index 05e3810132..41125fed20 100644
--- a/test/tint/builtins/gen/textureStore/31745b.wgsl
+++ b/test/tint/builtins/gen/textureStore/31745b.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl b/test/tint/builtins/gen/textureStore/32f368.wgsl
index 9065583a09..5b2aa6bf87 100644
--- a/test/tint/builtins/gen/textureStore/32f368.wgsl
+++ b/test/tint/builtins/gen/textureStore/32f368.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl b/test/tint/builtins/gen/textureStore/331aee.wgsl
index 3f04506b1f..115b0b0211 100644
--- a/test/tint/builtins/gen/textureStore/331aee.wgsl
+++ b/test/tint/builtins/gen/textureStore/331aee.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl b/test/tint/builtins/gen/textureStore/38e8d7.wgsl
index 5f80d00fb1..e8fc960497 100644
--- a/test/tint/builtins/gen/textureStore/38e8d7.wgsl
+++ b/test/tint/builtins/gen/textureStore/38e8d7.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl b/test/tint/builtins/gen/textureStore/3a52ac.wgsl
index e9f140f1d4..c129d6704e 100644
--- a/test/tint/builtins/gen/textureStore/3a52ac.wgsl
+++ b/test/tint/builtins/gen/textureStore/3a52ac.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl b/test/tint/builtins/gen/textureStore/3bb7a1.wgsl
index da7673c88f..d1cc97c88f 100644
--- a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl
+++ b/test/tint/builtins/gen/textureStore/3bb7a1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl b/test/tint/builtins/gen/textureStore/3bec15.wgsl
index 8273eea1bc..6c2e068a9e 100644
--- a/test/tint/builtins/gen/textureStore/3bec15.wgsl
+++ b/test/tint/builtins/gen/textureStore/3bec15.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl b/test/tint/builtins/gen/textureStore/441ba8.wgsl
index 28847866f4..4082003f96 100644
--- a/test/tint/builtins/gen/textureStore/441ba8.wgsl
+++ b/test/tint/builtins/gen/textureStore/441ba8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl b/test/tint/builtins/gen/textureStore/4fc057.wgsl
index c8322c50ef..c95a1cfad3 100644
--- a/test/tint/builtins/gen/textureStore/4fc057.wgsl
+++ b/test/tint/builtins/gen/textureStore/4fc057.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl b/test/tint/builtins/gen/textureStore/5a2f8f.wgsl
index 3bb2c4fe9c..6d800c9dde 100644
--- a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl
+++ b/test/tint/builtins/gen/textureStore/5a2f8f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl b/test/tint/builtins/gen/textureStore/60975f.wgsl
index 3c4e270e88..6ec404516a 100644
--- a/test/tint/builtins/gen/textureStore/60975f.wgsl
+++ b/test/tint/builtins/gen/textureStore/60975f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl b/test/tint/builtins/gen/textureStore/682fd6.wgsl
index 5c045a28e5..789c05161f 100644
--- a/test/tint/builtins/gen/textureStore/682fd6.wgsl
+++ b/test/tint/builtins/gen/textureStore/682fd6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl b/test/tint/builtins/gen/textureStore/6b75c3.wgsl
index e2e442814f..b6b95b641b 100644
--- a/test/tint/builtins/gen/textureStore/6b75c3.wgsl
+++ b/test/tint/builtins/gen/textureStore/6b75c3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl b/test/tint/builtins/gen/textureStore/6b80d2.wgsl
index e90d88262b..9e0850635a 100644
--- a/test/tint/builtins/gen/textureStore/6b80d2.wgsl
+++ b/test/tint/builtins/gen/textureStore/6b80d2.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl b/test/tint/builtins/gen/textureStore/6cff2e.wgsl
index 35ae4c1abd..79346c80c6 100644
--- a/test/tint/builtins/gen/textureStore/6cff2e.wgsl
+++ b/test/tint/builtins/gen/textureStore/6cff2e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl b/test/tint/builtins/gen/textureStore/6da692.wgsl
index aca5be588b..adad2a6b95 100644
--- a/test/tint/builtins/gen/textureStore/6da692.wgsl
+++ b/test/tint/builtins/gen/textureStore/6da692.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl b/test/tint/builtins/gen/textureStore/731349.wgsl
index 8024c9c163..82da1b3ed8 100644
--- a/test/tint/builtins/gen/textureStore/731349.wgsl
+++ b/test/tint/builtins/gen/textureStore/731349.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl b/test/tint/builtins/gen/textureStore/752da6.wgsl
index d08feee8aa..628b5e38c7 100644
--- a/test/tint/builtins/gen/textureStore/752da6.wgsl
+++ b/test/tint/builtins/gen/textureStore/752da6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl b/test/tint/builtins/gen/textureStore/77c0ae.wgsl
index b66192d68e..fd3e35bb75 100644
--- a/test/tint/builtins/gen/textureStore/77c0ae.wgsl
+++ b/test/tint/builtins/gen/textureStore/77c0ae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl b/test/tint/builtins/gen/textureStore/7cec8d.wgsl
index c8b02ebc1d..33f5538843 100644
--- a/test/tint/builtins/gen/textureStore/7cec8d.wgsl
+++ b/test/tint/builtins/gen/textureStore/7cec8d.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl b/test/tint/builtins/gen/textureStore/7f7fae.wgsl
index dc895e379c..e65082e7f6 100644
--- a/test/tint/builtins/gen/textureStore/7f7fae.wgsl
+++ b/test/tint/builtins/gen/textureStore/7f7fae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl b/test/tint/builtins/gen/textureStore/804942.wgsl
index 12a15edaf9..95ac5506ce 100644
--- a/test/tint/builtins/gen/textureStore/804942.wgsl
+++ b/test/tint/builtins/gen/textureStore/804942.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl b/test/tint/builtins/gen/textureStore/805dae.wgsl
index ab12e56842..9d96265647 100644
--- a/test/tint/builtins/gen/textureStore/805dae.wgsl
+++ b/test/tint/builtins/gen/textureStore/805dae.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl b/test/tint/builtins/gen/textureStore/83bcc1.wgsl
index 8910936736..fad38173fa 100644
--- a/test/tint/builtins/gen/textureStore/83bcc1.wgsl
+++ b/test/tint/builtins/gen/textureStore/83bcc1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl b/test/tint/builtins/gen/textureStore/872747.wgsl
index d06d0c5f9d..ebb8f4532a 100644
--- a/test/tint/builtins/gen/textureStore/872747.wgsl
+++ b/test/tint/builtins/gen/textureStore/872747.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl b/test/tint/builtins/gen/textureStore/8e0479.wgsl
index 2b5fe0a282..e948201ff2 100644
--- a/test/tint/builtins/gen/textureStore/8e0479.wgsl
+++ b/test/tint/builtins/gen/textureStore/8e0479.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl b/test/tint/builtins/gen/textureStore/8f71a1.wgsl
index 6b69dbba63..4d7c91ee0a 100644
--- a/test/tint/builtins/gen/textureStore/8f71a1.wgsl
+++ b/test/tint/builtins/gen/textureStore/8f71a1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl b/test/tint/builtins/gen/textureStore/969534.wgsl
index 4e9da11e57..5897793dd3 100644
--- a/test/tint/builtins/gen/textureStore/969534.wgsl
+++ b/test/tint/builtins/gen/textureStore/969534.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl b/test/tint/builtins/gen/textureStore/9a3ecc.wgsl
index 19c3dd8bbd..6fd2d30105 100644
--- a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl
+++ b/test/tint/builtins/gen/textureStore/9a3ecc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl b/test/tint/builtins/gen/textureStore/9d9cd5.wgsl
index 663ecb4c0f..4c09b3a33a 100644
--- a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl
+++ b/test/tint/builtins/gen/textureStore/9d9cd5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl b/test/tint/builtins/gen/textureStore/9e3ec5.wgsl
index f571ee5fd3..72323bd3e2 100644
--- a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl
+++ b/test/tint/builtins/gen/textureStore/9e3ec5.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl b/test/tint/builtins/gen/textureStore/ac67aa.wgsl
index db9ed2429c..e9392db438 100644
--- a/test/tint/builtins/gen/textureStore/ac67aa.wgsl
+++ b/test/tint/builtins/gen/textureStore/ac67aa.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl b/test/tint/builtins/gen/textureStore/b706b1.wgsl
index db32739f77..bd55c9efcc 100644
--- a/test/tint/builtins/gen/textureStore/b706b1.wgsl
+++ b/test/tint/builtins/gen/textureStore/b706b1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl b/test/tint/builtins/gen/textureStore/bbcb7f.wgsl
index 3006729de7..b220ec5328 100644
--- a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl
+++ b/test/tint/builtins/gen/textureStore/bbcb7f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl b/test/tint/builtins/gen/textureStore/be6e30.wgsl
index a21d2cc20a..af203c8a0a 100644
--- a/test/tint/builtins/gen/textureStore/be6e30.wgsl
+++ b/test/tint/builtins/gen/textureStore/be6e30.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl b/test/tint/builtins/gen/textureStore/bf775c.wgsl
index e8152507bf..c793b5f986 100644
--- a/test/tint/builtins/gen/textureStore/bf775c.wgsl
+++ b/test/tint/builtins/gen/textureStore/bf775c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl b/test/tint/builtins/gen/textureStore/c5af1e.wgsl
index bd91c6bfcc..8c8a49d24b 100644
--- a/test/tint/builtins/gen/textureStore/c5af1e.wgsl
+++ b/test/tint/builtins/gen/textureStore/c5af1e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl b/test/tint/builtins/gen/textureStore/c863be.wgsl
index 555f7c55ba..2e60dd2656 100644
--- a/test/tint/builtins/gen/textureStore/c863be.wgsl
+++ b/test/tint/builtins/gen/textureStore/c863be.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl b/test/tint/builtins/gen/textureStore/d73b5c.wgsl
index 081cfaad63..21d95b93d3 100644
--- a/test/tint/builtins/gen/textureStore/d73b5c.wgsl
+++ b/test/tint/builtins/gen/textureStore/d73b5c.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl b/test/tint/builtins/gen/textureStore/dd7d81.wgsl
index 8d464b3420..93a30cd113 100644
--- a/test/tint/builtins/gen/textureStore/dd7d81.wgsl
+++ b/test/tint/builtins/gen/textureStore/dd7d81.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl b/test/tint/builtins/gen/textureStore/dde364.wgsl
index 17ad913c7e..d613cb7391 100644
--- a/test/tint/builtins/gen/textureStore/dde364.wgsl
+++ b/test/tint/builtins/gen/textureStore/dde364.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl b/test/tint/builtins/gen/textureStore/e885e8.wgsl
index c2fc4e343f..025f448c94 100644
--- a/test/tint/builtins/gen/textureStore/e885e8.wgsl
+++ b/test/tint/builtins/gen/textureStore/e885e8.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl b/test/tint/builtins/gen/textureStore/eb702f.wgsl
index a73e622249..a188948c2c 100644
--- a/test/tint/builtins/gen/textureStore/eb702f.wgsl
+++ b/test/tint/builtins/gen/textureStore/eb702f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl b/test/tint/builtins/gen/textureStore/eb78b9.wgsl
index a18ce912d2..5c1857bcd3 100644
--- a/test/tint/builtins/gen/textureStore/eb78b9.wgsl
+++ b/test/tint/builtins/gen/textureStore/eb78b9.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl b/test/tint/builtins/gen/textureStore/ee6acc.wgsl
index 904b12ecf9..43201cc48d 100644
--- a/test/tint/builtins/gen/textureStore/ee6acc.wgsl
+++ b/test/tint/builtins/gen/textureStore/ee6acc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl b/test/tint/builtins/gen/textureStore/ef9f2f.wgsl
index 726ec09a59..6296d30271 100644
--- a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl
+++ b/test/tint/builtins/gen/textureStore/ef9f2f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl b/test/tint/builtins/gen/textureStore/f8dead.wgsl
index d9ce55add1..8954b30af6 100644
--- a/test/tint/builtins/gen/textureStore/f8dead.wgsl
+++ b/test/tint/builtins/gen/textureStore/f8dead.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl b/test/tint/builtins/gen/textureStore/f9be83.wgsl
index 23ab5fe1e6..09830dcaa5 100644
--- a/test/tint/builtins/gen/textureStore/f9be83.wgsl
+++ b/test/tint/builtins/gen/textureStore/f9be83.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl b/test/tint/builtins/gen/textureStore/fb9a8f.wgsl
index 69f751566d..78ac51e16c 100644
--- a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl
+++ b/test/tint/builtins/gen/textureStore/fb9a8f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl b/test/tint/builtins/gen/textureStore/fbf53f.wgsl
index 3179ff37d1..d0d41a13ec 100644
--- a/test/tint/builtins/gen/textureStore/fbf53f.wgsl
+++ b/test/tint/builtins/gen/textureStore/fbf53f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl b/test/tint/builtins/gen/transpose/2585cd.wgsl
index 4b2d6784c8..f111002e8b 100644
--- a/test/tint/builtins/gen/transpose/2585cd.wgsl
+++ b/test/tint/builtins/gen/transpose/2585cd.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl b/test/tint/builtins/gen/transpose/31d679.wgsl
index 2e7764b7ed..18c1a51a2e 100644
--- a/test/tint/builtins/gen/transpose/31d679.wgsl
+++ b/test/tint/builtins/gen/transpose/31d679.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl b/test/tint/builtins/gen/transpose/31e37e.wgsl
index 27f5115f74..1b411a7ac2 100644
--- a/test/tint/builtins/gen/transpose/31e37e.wgsl
+++ b/test/tint/builtins/gen/transpose/31e37e.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl b/test/tint/builtins/gen/transpose/4ce359.wgsl
index ce8637ac39..947cd87935 100644
--- a/test/tint/builtins/gen/transpose/4ce359.wgsl
+++ b/test/tint/builtins/gen/transpose/4ce359.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl b/test/tint/builtins/gen/transpose/4dc9a1.wgsl
index 4e9b5059e7..f4d5dc3330 100644
--- a/test/tint/builtins/gen/transpose/4dc9a1.wgsl
+++ b/test/tint/builtins/gen/transpose/4dc9a1.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/854336.wgsl b/test/tint/builtins/gen/transpose/854336.wgsl
index 2a70805d36..ffb40b7bf5 100644
--- a/test/tint/builtins/gen/transpose/854336.wgsl
+++ b/test/tint/builtins/gen/transpose/854336.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl b/test/tint/builtins/gen/transpose/c1b600.wgsl
index 56c4333eec..7e4683f1a7 100644
--- a/test/tint/builtins/gen/transpose/c1b600.wgsl
+++ b/test/tint/builtins/gen/transpose/c1b600.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl b/test/tint/builtins/gen/transpose/d8f8ba.wgsl
index b4fd7ae23d..f8ec16ca06 100644
--- a/test/tint/builtins/gen/transpose/d8f8ba.wgsl
+++ b/test/tint/builtins/gen/transpose/d8f8ba.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl b/test/tint/builtins/gen/transpose/ed4bdc.wgsl
index 409646d9ef..9b5fb4bd10 100644
--- a/test/tint/builtins/gen/transpose/ed4bdc.wgsl
+++ b/test/tint/builtins/gen/transpose/ed4bdc.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl b/test/tint/builtins/gen/trunc/562d05.wgsl
index 2f11f6a804..4aab73d02e 100644
--- a/test/tint/builtins/gen/trunc/562d05.wgsl
+++ b/test/tint/builtins/gen/trunc/562d05.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl b/test/tint/builtins/gen/trunc/e183aa.wgsl
index c450642a0e..bd01e6f912 100644
--- a/test/tint/builtins/gen/trunc/e183aa.wgsl
+++ b/test/tint/builtins/gen/trunc/e183aa.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl b/test/tint/builtins/gen/trunc/eb83df.wgsl
index 1983f325d1..406f2a3b51 100644
--- a/test/tint/builtins/gen/trunc/eb83df.wgsl
+++ b/test/tint/builtins/gen/trunc/eb83df.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl b/test/tint/builtins/gen/trunc/f370d3.wgsl
index 4990c18e4e..cb6e843662 100644
--- a/test/tint/builtins/gen/trunc/f370d3.wgsl
+++ b/test/tint/builtins/gen/trunc/f370d3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl b/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
index 84896b01f8..c3dbec2291 100644
--- a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
+++ b/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl b/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
index 230035a90b..3a5952e3bf 100644
--- a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
+++ b/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl b/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
index 8d893e1501..82e0ce9e36 100644
--- a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
+++ b/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl b/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
index a4c4e19e81..6cabee7c54 100644
--- a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
+++ b/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl b/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
index a522dd150e..cee8f63143 100644
--- a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
+++ b/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl b/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
index 076c18c4b0..2f1d6d6ba3 100644
--- a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
+++ b/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
+// and the intrinsic defintion file:
+//   src/tint/intrinsics.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tools/src/cmd/builtin-gen/ast/ast.go b/tools/src/cmd/intrinsic-gen/ast/ast.go
similarity index 99%
rename from tools/src/cmd/builtin-gen/ast/ast.go
rename to tools/src/cmd/intrinsic-gen/ast/ast.go
index 228c9f6bc9..92dcaa7800 100644
--- a/tools/src/cmd/builtin-gen/ast/ast.go
+++ b/tools/src/cmd/intrinsic-gen/ast/ast.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/tok"
 )
 
 // AST is the parsed syntax tree of the intrinsic definition file
diff --git a/tools/src/cmd/builtin-gen/gen/builtin_table.go b/tools/src/cmd/intrinsic-gen/gen/builtin_table.go
similarity index 99%
rename from tools/src/cmd/builtin-gen/gen/builtin_table.go
rename to tools/src/cmd/intrinsic-gen/gen/builtin_table.go
index 10cdcb0da9..b3bfa16743 100644
--- a/tools/src/cmd/builtin-gen/gen/builtin_table.go
+++ b/tools/src/cmd/intrinsic-gen/gen/builtin_table.go
@@ -17,7 +17,7 @@ package gen
 import (
 	"fmt"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/sem"
 	"dawn.googlesource.com/dawn/tools/src/list"
 	"dawn.googlesource.com/dawn/tools/src/lut"
 )
diff --git a/tools/src/cmd/builtin-gen/gen/generate.go b/tools/src/cmd/intrinsic-gen/gen/generate.go
similarity index 99%
rename from tools/src/cmd/builtin-gen/gen/generate.go
rename to tools/src/cmd/intrinsic-gen/gen/generate.go
index 71456b1341..246fb7b853 100644
--- a/tools/src/cmd/builtin-gen/gen/generate.go
+++ b/tools/src/cmd/intrinsic-gen/gen/generate.go
@@ -22,7 +22,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/sem"
 )
 
 type generator struct {
diff --git a/tools/src/cmd/builtin-gen/gen/permutate.go b/tools/src/cmd/intrinsic-gen/gen/permutate.go
similarity index 99%
rename from tools/src/cmd/builtin-gen/gen/permutate.go
rename to tools/src/cmd/intrinsic-gen/gen/permutate.go
index e9a5644f26..934e966161 100644
--- a/tools/src/cmd/builtin-gen/gen/permutate.go
+++ b/tools/src/cmd/intrinsic-gen/gen/permutate.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/sem"
 	"dawn.googlesource.com/dawn/tools/src/fileutils"
 )
 
diff --git a/tools/src/cmd/builtin-gen/lexer/lexer.go b/tools/src/cmd/intrinsic-gen/lexer/lexer.go
similarity index 98%
rename from tools/src/cmd/builtin-gen/lexer/lexer.go
rename to tools/src/cmd/intrinsic-gen/lexer/lexer.go
index db8d92e88b..749ab0d374 100644
--- a/tools/src/cmd/builtin-gen/lexer/lexer.go
+++ b/tools/src/cmd/intrinsic-gen/lexer/lexer.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"unicode"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/tok"
 )
 
 // Lex produces a list of tokens for the given source code
diff --git a/tools/src/cmd/builtin-gen/lexer/lexer_test.go b/tools/src/cmd/intrinsic-gen/lexer/lexer_test.go
similarity index 97%
rename from tools/src/cmd/builtin-gen/lexer/lexer_test.go
rename to tools/src/cmd/intrinsic-gen/lexer/lexer_test.go
index bfd512859d..51130e5d1f 100644
--- a/tools/src/cmd/builtin-gen/lexer/lexer_test.go
+++ b/tools/src/cmd/intrinsic-gen/lexer/lexer_test.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/lexer"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/lexer"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/tok"
 )
 
 func TestLexTokens(t *testing.T) {
diff --git a/tools/src/cmd/builtin-gen/main.go b/tools/src/cmd/intrinsic-gen/main.go
similarity index 88%
rename from tools/src/cmd/builtin-gen/main.go
rename to tools/src/cmd/intrinsic-gen/main.go
index eba8995736..c9235f455e 100644
--- a/tools/src/cmd/builtin-gen/main.go
+++ b/tools/src/cmd/intrinsic-gen/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// builtin-gen parses the <tint>/src/tint/builtins.def file, then scans the
+// intrinsic-gen parses the <tint>/src/tint/intrinsics.def file, then scans the
 // project directory for '<file>.tmpl' files, to produce '<file>' source code
 // files.
 package main
@@ -25,14 +25,14 @@ import (
 	"path/filepath"
 	"strings"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/gen"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/resolver"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/gen"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/parser"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/resolver"
 	"dawn.googlesource.com/dawn/tools/src/fileutils"
 	"dawn.googlesource.com/dawn/tools/src/glob"
 )
 
-const defProjectRelPath = "src/tint/builtins.def"
+const defProjectRelPath = "src/tint/intrinsics.def"
 
 func main() {
 	if err := run(); err != nil {
@@ -43,13 +43,13 @@ func main() {
 
 func showUsage() {
 	fmt.Println(`
-builtin-gen generates the builtin table for the Tint compiler
+intrinsic-gen generates the intrinsic table for the Tint compiler
 
-builtin-gen parses the <tint>/src/tint/builtins.def file, then scans the project
+intrinsic-gen parses the <tint>/src/tint/intrinsics.def file, then scans the project
 directory for '<file>.tmpl' files, to produce '<file>' source code files.
 
 usage:
-  builtin-gen
+  intrinsic-gen
 
 optional flags:`)
 	flag.PrintDefaults()
@@ -161,10 +161,10 @@ const header = `// Copyright 2021 The Tint Authors.
 // limitations under the License.
 
 ////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
+// File generated by tools/intrinsic-gen
 // using the template:
 //   %v
-// and the builtin defintion file:
+// and the intrinsic defintion file:
 //   %v
 //
 // Do not modify this file directly
diff --git a/tools/src/cmd/builtin-gen/parser/parser.go b/tools/src/cmd/intrinsic-gen/parser/parser.go
similarity index 97%
rename from tools/src/cmd/builtin-gen/parser/parser.go
rename to tools/src/cmd/intrinsic-gen/parser/parser.go
index d0343a505a..cd775cca4b 100644
--- a/tools/src/cmd/builtin-gen/parser/parser.go
+++ b/tools/src/cmd/intrinsic-gen/parser/parser.go
@@ -19,9 +19,9 @@ package parser
 import (
 	"fmt"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/lexer"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/ast"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/lexer"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/tok"
 )
 
 // Parse produces a list of tokens for the given source code
diff --git a/tools/src/cmd/builtin-gen/parser/parser_test.go b/tools/src/cmd/intrinsic-gen/parser/parser_test.go
similarity index 97%
rename from tools/src/cmd/builtin-gen/parser/parser_test.go
rename to tools/src/cmd/intrinsic-gen/parser/parser_test.go
index 10f355d08c..ae78113e70 100644
--- a/tools/src/cmd/builtin-gen/parser/parser_test.go
+++ b/tools/src/cmd/intrinsic-gen/parser/parser_test.go
@@ -17,8 +17,8 @@ package parser_test
 import (
 	"testing"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/ast"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/parser"
 )
 
 func TestParser(t *testing.T) {
diff --git a/tools/src/cmd/builtin-gen/resolver/resolve.go b/tools/src/cmd/intrinsic-gen/resolver/resolve.go
similarity index 98%
rename from tools/src/cmd/builtin-gen/resolver/resolve.go
rename to tools/src/cmd/intrinsic-gen/resolver/resolve.go
index b9c701479f..f7f662adf2 100644
--- a/tools/src/cmd/builtin-gen/resolver/resolve.go
+++ b/tools/src/cmd/intrinsic-gen/resolver/resolve.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"sort"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/sem"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/tok"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/ast"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/sem"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/tok"
 )
 
 type resolver struct {
diff --git a/tools/src/cmd/builtin-gen/resolver/resolver_test.go b/tools/src/cmd/intrinsic-gen/resolver/resolver_test.go
similarity index 97%
rename from tools/src/cmd/builtin-gen/resolver/resolver_test.go
rename to tools/src/cmd/intrinsic-gen/resolver/resolver_test.go
index d331a12c91..1768dbf9f3 100644
--- a/tools/src/cmd/builtin-gen/resolver/resolver_test.go
+++ b/tools/src/cmd/intrinsic-gen/resolver/resolver_test.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"testing"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/parser"
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/resolver"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/parser"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/resolver"
 )
 
 func TestResolver(t *testing.T) {
diff --git a/tools/src/cmd/builtin-gen/sem/sem.go b/tools/src/cmd/intrinsic-gen/sem/sem.go
similarity index 99%
rename from tools/src/cmd/builtin-gen/sem/sem.go
rename to tools/src/cmd/intrinsic-gen/sem/sem.go
index 8db6fb07fb..3d50bc28eb 100644
--- a/tools/src/cmd/builtin-gen/sem/sem.go
+++ b/tools/src/cmd/intrinsic-gen/sem/sem.go
@@ -17,7 +17,7 @@ package sem
 import (
 	"fmt"
 
-	"dawn.googlesource.com/dawn/tools/src/cmd/builtin-gen/ast"
+	"dawn.googlesource.com/dawn/tools/src/cmd/intrinsic-gen/ast"
 )
 
 // Sem is the root of the semantic tree
diff --git a/tools/src/cmd/builtin-gen/tok/tok.go b/tools/src/cmd/intrinsic-gen/tok/tok.go
similarity index 100%
rename from tools/src/cmd/builtin-gen/tok/tok.go
rename to tools/src/cmd/intrinsic-gen/tok/tok.go