[tint] Always enable IR validation assertions in tests Instead of using the default set by the build-time flag, we should just always enable validation assertions for tests. Change-Id: I1abf891bf7b4bc226a34c49accbd1ac3af3fe8e9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/299877 Reviewed-by: dan sinclair <dsinclair@chromium.org> Commit-Queue: James Price <jrprice@google.com>
diff --git a/src/tint/lang/core/ir/ir_helper_test.h b/src/tint/lang/core/ir/ir_helper_test.h index e2983f3..1e18afe 100644 --- a/src/tint/lang/core/ir/ir_helper_test.h +++ b/src/tint/lang/core/ir/ir_helper_test.h
@@ -42,7 +42,7 @@ template <typename BASE> class IRTestHelperBase : public BASE { public: - IRTestHelperBase() = default; + IRTestHelperBase() { mod.enable_validation_asserts = true; } ~IRTestHelperBase() override = default; /// The IR module
diff --git a/src/tint/lang/core/ir/transform/helper_test.h b/src/tint/lang/core/ir/transform/helper_test.h index c265ab8..e948ae5 100644 --- a/src/tint/lang/core/ir/transform/helper_test.h +++ b/src/tint/lang/core/ir/transform/helper_test.h
@@ -47,6 +47,8 @@ /// @param args the arguments to the transform function template <typename TRANSFORM, typename... ARGS> void Run(TRANSFORM&& transform_func, ARGS&&... args) { + mod.enable_validation_asserts = true; + // Run the transform. auto result = transform_func(mod, std::forward<ARGS>(args)...); EXPECT_EQ(result, Success);
diff --git a/src/tint/lang/glsl/writer/helper_test.h b/src/tint/lang/glsl/writer/helper_test.h index ddaa970..f4ac4e1 100644 --- a/src/tint/lang/glsl/writer/helper_test.h +++ b/src/tint/lang/glsl/writer/helper_test.h
@@ -64,6 +64,8 @@ Result<SuccessType> Generate( Options options = {}, core::ir::Function::PipelineStage stage = core::ir::Function::PipelineStage::kCompute) { + mod.enable_validation_asserts = true; + options.entry_point_name = "main"; auto result = writer::Generate(mod, options); TINT_CHECK_RESULT(result);
diff --git a/src/tint/lang/hlsl/writer/helper_test.h b/src/tint/lang/hlsl/writer/helper_test.h index 3b25fbd..eb6930e 100644 --- a/src/tint/lang/hlsl/writer/helper_test.h +++ b/src/tint/lang/hlsl/writer/helper_test.h
@@ -58,6 +58,8 @@ /// Run the writer on the IR module and validate the result. /// @returns true if generation and validation succeeded Result<SuccessType> Generate(Options options = {}) { + mod.enable_validation_asserts = true; + if (options.entry_point_name.empty()) { options.entry_point_name = "main"; }
diff --git a/src/tint/lang/msl/writer/helper_test.h b/src/tint/lang/msl/writer/helper_test.h index c905467..4f74b49 100644 --- a/src/tint/lang/msl/writer/helper_test.h +++ b/src/tint/lang/msl/writer/helper_test.h
@@ -81,6 +81,8 @@ Result<SuccessType> Generate( Options options = {}, validate::MslVersion msl_version = validate::MslVersion::kMsl_2_3) { + mod.enable_validation_asserts = true; + if (options.entry_point_name.empty()) { options.entry_point_name = "entry"; }
diff --git a/src/tint/lang/spirv/reader/helper_test.h b/src/tint/lang/spirv/reader/helper_test.h index d05958d..84cdad3 100644 --- a/src/tint/lang/spirv/reader/helper_test.h +++ b/src/tint/lang/spirv/reader/helper_test.h
@@ -61,7 +61,10 @@ TINT_CHECK_RESULT_UNWRAP(binary, Assemble(spirv_asm)); // Parse the SPIR-V to produce a core IR module. - TINT_CHECK_RESULT_UNWRAP(parsed, ReadIR(binary)); + Options options{ + .enable_validation_asserts = true, + }; + TINT_CHECK_RESULT_UNWRAP(parsed, ReadIR(binary, options)); // Validate the IR module against the capabilities supported by the core dialect. TINT_CHECK_RESULT(
diff --git a/src/tint/lang/spirv/writer/common/helper_test.h b/src/tint/lang/spirv/writer/common/helper_test.h index 8d0b777..18ababc 100644 --- a/src/tint/lang/spirv/writer/common/helper_test.h +++ b/src/tint/lang/spirv/writer/common/helper_test.h
@@ -107,6 +107,8 @@ /// storage class with OpConstantNull /// @returns success or a failure message tint::Result<SuccessType> Generate(Options options = {}) { + mod.enable_validation_asserts = true; + if (options.entry_point_name.empty()) { options.entry_point_name = "main"; }