Remove `preserve_unicode` option to the Renamer.
The `preserve_unicode` flag was only set in some HLSL tests, otherwise
it was always `false`. Remove the flag as unneeded.
Bug: 378726537
Change-Id: I33375a0e2db2f451fb67fe8641804e99e2286036
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/217075
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
diff --git a/src/dawn/native/opengl/ShaderModuleGL.cpp b/src/dawn/native/opengl/ShaderModuleGL.cpp
index 4cfa5cd..00b8403 100644
--- a/src/dawn/native/opengl/ShaderModuleGL.cpp
+++ b/src/dawn/native/opengl/ShaderModuleGL.cpp
@@ -532,7 +532,7 @@
transformInputs.Add<tint::ast::transform::Renamer::Config>(
r.disableSymbolRenaming ? tint::ast::transform::Renamer::Target::kGlslKeywords
: tint::ast::transform::Renamer::Target::kAll,
- false, std::move(assignedRenamings));
+ std::move(assignedRenamings));
}
if (r.substituteOverrideConfig) {
diff --git a/src/tint/cmd/tint/main.cc b/src/tint/cmd/tint/main.cc
index bc5b40c..cc66710 100644
--- a/src/tint/cmd/tint/main.cc
+++ b/src/tint/cmd/tint/main.cc
@@ -656,8 +656,7 @@
case Format::kMsl: {
if (!options.rename_all) {
transform_inputs.Add<tint::ast::transform::Renamer::Config>(
- tint::ast::transform::Renamer::Target::kMslKeywords,
- /* preserve_unicode */ false);
+ tint::ast::transform::Renamer::Target::kMslKeywords);
}
transform_manager.Add<tint::ast::transform::Renamer>();
break;
@@ -665,8 +664,7 @@
case Format::kGlsl: {
if (!options.rename_all) {
transform_inputs.Add<tint::ast::transform::Renamer::Config>(
- tint::ast::transform::Renamer::Target::kGlslKeywords,
- /* preserve_unicode */ false);
+ tint::ast::transform::Renamer::Target::kGlslKeywords);
}
transform_manager.Add<tint::ast::transform::Renamer>();
break;
@@ -675,8 +673,7 @@
case Format::kHlslFxc: {
if (!options.rename_all) {
transform_inputs.Add<tint::ast::transform::Renamer::Config>(
- tint::ast::transform::Renamer::Target::kHlslKeywords,
- /* preserve_unicode */ false);
+ tint::ast::transform::Renamer::Target::kHlslKeywords);
}
transform_manager.Add<tint::ast::transform::Renamer>();
break;
diff --git a/src/tint/lang/hlsl/writer/ast_printer/helper_test.h b/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
index 095ae556..d538a4a 100644
--- a/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
+++ b/src/tint/lang/hlsl/writer/ast_printer/helper_test.h
@@ -102,8 +102,7 @@
ast::transform::DataMap transform_data;
ast::transform::DataMap outputs;
transform_data.Add<ast::transform::Renamer::Config>(
- ast::transform::Renamer::Target::kHlslKeywords,
- /* preserve_unicode */ true);
+ ast::transform::Renamer::Target::kHlslKeywords);
transform_manager.Add<tint::ast::transform::Renamer>();
auto result = transform_manager.Run(sanitized_result.program, transform_data, outputs);
if (!result.IsValid()) {
diff --git a/src/tint/lang/hlsl/writer/writer_ast_fuzz.cc b/src/tint/lang/hlsl/writer/writer_ast_fuzz.cc
index 904ccd3..86b93e1 100644
--- a/src/tint/lang/hlsl/writer/writer_ast_fuzz.cc
+++ b/src/tint/lang/hlsl/writer/writer_ast_fuzz.cc
@@ -84,8 +84,7 @@
if (!context.options.dxc.empty()) {
dxc_path = context.options.dxc.c_str();
ast::transform::DataMap inputs, outputs;
- inputs.Add<ast::transform::Renamer::Config>(ast::transform::Renamer::Target::kHlslKeywords,
- /* preserve_unicode */ false);
+ inputs.Add<ast::transform::Renamer::Config>(ast::transform::Renamer::Target::kHlslKeywords);
if (auto renamer_res = tint::ast::transform::Renamer{}.Apply(program, inputs, outputs)) {
if (!renamer_res->IsValid()) {
TINT_ICE() << renamer_res->Diagnostics();
diff --git a/src/tint/lang/wgsl/ast/transform/renamer.cc b/src/tint/lang/wgsl/ast/transform/renamer.cc
index 4baf791..19e6072 100644
--- a/src/tint/lang/wgsl/ast/transform/renamer.cc
+++ b/src/tint/lang/wgsl/ast/transform/renamer.cc
@@ -1263,14 +1263,20 @@
} // namespace
Renamer::Data::Data(Remappings&& r) : remappings(std::move(r)) {}
+
Renamer::Data::Data(const Data&) = default;
+
Renamer::Data::~Data() = default;
Renamer::Config::Config() = default;
-Renamer::Config::Config(Target t, bool pu) : target(t), preserve_unicode(pu) {}
-Renamer::Config::Config(Target t, bool pu, Remappings&& remappings)
- : target(t), preserve_unicode(pu), requested_names(std::move(remappings)) {}
+
+Renamer::Config::Config(Target t) : target(t) {}
+
+Renamer::Config::Config(Target t, Remappings&& remappings)
+ : target(t), requested_names(std::move(remappings)) {}
+
Renamer::Config::Config(const Config&) = default;
+
Renamer::Config::~Config() = default;
Renamer::Renamer() = default;
@@ -1346,12 +1352,10 @@
}
Target target = Target::kAll;
- bool preserve_unicode = false;
const Remappings* requested_names = nullptr;
if (auto* cfg = inputs.Get<Config>()) {
target = cfg->target;
- preserve_unicode = cfg->preserve_unicode;
requested_names = &(cfg->requested_names);
}
@@ -1362,9 +1366,8 @@
}
auto name = symbol.Name();
if (!tint::utf8::IsASCII(name)) {
- // name is non-ascii. All of the backend keywords are ascii, so rename if we're not
- // preserving unicode symbols.
- return !preserve_unicode;
+ // name is non-ascii. All of the backend keywords are ascii, so rename.
+ return true;
}
switch (target) {
case Target::kGlslKeywords:
diff --git a/src/tint/lang/wgsl/ast/transform/renamer.h b/src/tint/lang/wgsl/ast/transform/renamer.h
index ec244da..bafd3ec 100644
--- a/src/tint/lang/wgsl/ast/transform/renamer.h
+++ b/src/tint/lang/wgsl/ast/transform/renamer.h
@@ -79,15 +79,13 @@
/// Constructor
/// @param tgt the targets to rename
- /// @param keep_unicode if false, symbols with non-ascii code-points are
/// renamed
- explicit Config(Target tgt, bool keep_unicode = false);
+ explicit Config(Target tgt);
/// Constructor
/// @param tgt the targets to rename
- /// @param keep_unicode if false, symbols with non-ascii code-points are renamed
/// @param remappings requested old to new name map
- explicit Config(Target tgt, bool keep_unicode, Remappings&& remappings);
+ Config(Target tgt, Remappings&& remappings);
/// Copy constructor
Config(const Config&);
@@ -98,14 +96,11 @@
/// The targets to rename
Target target = Target::kAll;
- /// If false, symbols with non-ascii code-points are renamed.
- bool preserve_unicode = false;
-
/// Requested renaming rules
Remappings requested_names = {};
/// Reflection for this class
- TINT_REFLECT(Config, target, preserve_unicode, requested_names);
+ TINT_REFLECT(Config, target, requested_names);
};
/// Constructor using a the configuration provided in the input Data
diff --git a/src/tint/lang/wgsl/ast/transform/renamer_test.cc b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
index 3d1730c..7fc648f 100644
--- a/src/tint/lang/wgsl/ast/transform/renamer_test.cc
+++ b/src/tint/lang/wgsl/ast/transform/renamer_test.cc
@@ -150,7 +150,6 @@
DataMap inputs;
inputs.Add<Renamer::Config>(Renamer::Target::kAll,
- /* preserve_unicode */ false,
/* remappings */
Renamer::Remappings{
{"var1", "user_var1"},
@@ -387,49 +386,6 @@
EXPECT_THAT(data->remappings, ContainerEq(expected_remappings));
}
-TEST_F(RenamerTest, PreserveUnicode) {
- auto src = R"(
-@fragment
-fn frag_main() {
- var )" + std::string(kUnicodeIdentifier) +
- R"( : i32;
-}
-)";
-
- auto expect = src;
-
- DataMap inputs;
- inputs.Add<Renamer::Config>(Renamer::Target::kMslKeywords,
- /* preserve_unicode */ true);
- auto got = Run<Renamer>(src, inputs);
-
- EXPECT_EQ(expect, str(got));
-}
-
-TEST_F(RenamerTest, PreserveUnicodeRenameAll) {
- auto src = R"(
-@fragment
-fn frag_main() {
- var )" + std::string(kUnicodeIdentifier) +
- R"( : i32;
-}
-)";
-
- auto expect = R"(
-@fragment
-fn tint_symbol() {
- var tint_symbol_1 : i32;
-}
-)";
-
- DataMap inputs;
- inputs.Add<Renamer::Config>(Renamer::Target::kAll,
- /* preserve_unicode */ true);
- auto got = Run<Renamer>(src, inputs);
-
- EXPECT_EQ(expect, str(got));
-}
-
TEST_F(RenamerTest, AttemptSymbolCollision) {
auto* src = R"(
@vertex
@@ -533,8 +489,7 @@
)";
DataMap inputs;
- inputs.Add<Renamer::Config>(Renamer::Target::kGlslKeywords,
- /* preserve_unicode */ false);
+ inputs.Add<Renamer::Config>(Renamer::Target::kGlslKeywords);
auto got = Run<Renamer>(src, inputs);
EXPECT_EQ(expect, str(got));
@@ -559,8 +514,7 @@
)";
DataMap inputs;
- inputs.Add<Renamer::Config>(Renamer::Target::kHlslKeywords,
- /* preserve_unicode */ false);
+ inputs.Add<Renamer::Config>(Renamer::Target::kHlslKeywords);
auto got = Run<Renamer>(src, inputs);
EXPECT_EQ(expect, str(got));
@@ -585,8 +539,7 @@
)";
DataMap inputs;
- inputs.Add<Renamer::Config>(Renamer::Target::kMslKeywords,
- /* preserve_unicode */ false);
+ inputs.Add<Renamer::Config>(Renamer::Target::kMslKeywords);
auto got = Run<Renamer>(src, inputs);
EXPECT_EQ(expect, str(got));
