Remove fuzzers for transforms that should only be invoked by sanitizers
Also mark code elements that should be removed as part of
https://crbug.com/tint/753
BUG=tint:722
Change-Id: I52aedeffcb06e302f8399d83986909b36749ca5e
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/49560
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/fuzzers/BUILD.gn b/fuzzers/BUILD.gn
index 7de9983..9f00ed3 100644
--- a/fuzzers/BUILD.gn
+++ b/fuzzers/BUILD.gn
@@ -76,16 +76,7 @@
deps = [ ":tint_fuzzer_common" ]
}
- fuzzer_test("tint_calculate_array_length_fuzzer") {
- sources = [ "tint_calculate_array_length_fuzzer.cc" ]
- deps = [ ":tint_fuzzer_common" ]
- }
-
- fuzzer_test("tint_canonicalize_entry_point_io_fuzzer") {
- sources = [ "tint_canonicalize_entry_point_io_fuzzer.cc" ]
- deps = [ ":tint_fuzzer_common" ]
- }
-
+ # TODO(tint:753): Remove once transform used by sanitizers
fuzzer_test("tint_emit_vertex_point_size_fuzzer") {
sources = [ "tint_emit_vertex_point_size_fuzzer.cc" ]
deps = [ ":tint_fuzzer_common" ]
@@ -173,9 +164,8 @@
":tint_all_transforms_fuzzer",
":tint_binding_remapper_fuzzer",
":tint_bound_array_accessors_fuzzer",
- ":tint_calculate_array_length_fuzzer",
- ":tint_canonicalize_entry_point_io_fuzzer",
- ":tint_emit_vertex_point_size_fuzzer",
+ ":tint_emit_vertex_point_size_fuzzer", # TODO(tint:753): Remove once
+ # transform used by sanitizers
":tint_first_index_offset_fuzzer",
":tint_inspector_fuzzer",
":tint_wgsl_reader_spv_writer_fuzzer",
diff --git a/fuzzers/CMakeLists.txt b/fuzzers/CMakeLists.txt
index 98abf30..f0c617d 100644
--- a/fuzzers/CMakeLists.txt
+++ b/fuzzers/CMakeLists.txt
@@ -33,9 +33,7 @@
add_tint_fuzzer(tint_all_transforms_fuzzer)
add_tint_fuzzer(tint_binding_remapper_fuzzer)
add_tint_fuzzer(tint_bound_array_accessors_fuzzer)
- add_tint_fuzzer(tint_calculate_array_length_fuzzer)
- add_tint_fuzzer(tint_canonicalize_entry_point_io_fuzzer)
- add_tint_fuzzer(tint_emit_vertex_point_size_fuzzer)
+ add_tint_fuzzer(tint_emit_vertex_point_size_fuzzer) # TODO(tint:753): Remove once transform used by sanitizers
add_tint_fuzzer(tint_first_index_offset_fuzzer)
add_tint_fuzzer(tint_inspector_fuzzer)
add_tint_fuzzer(tint_wgsl_reader_spv_writer_fuzzer)
diff --git a/fuzzers/tint_all_transforms_fuzzer.cc b/fuzzers/tint_all_transforms_fuzzer.cc
index 36ed341..95b130f 100644
--- a/fuzzers/tint_all_transforms_fuzzer.cc
+++ b/fuzzers/tint_all_transforms_fuzzer.cc
@@ -30,11 +30,11 @@
}
transform_manager.Add<transform::BoundArrayAccessors>();
- transform_manager.Add<transform::EmitVertexPointSize>();
+ transform_manager
+ .Add<transform::EmitVertexPointSize>(); // TODO(tint:753): Remove once
+ // transform used by sanitizers
transform_manager.Add<transform::FirstIndexOffset>();
transform_manager.Add<transform::BindingRemapper>();
- transform_manager.Add<transform::CalculateArrayLength>();
- transform_manager.Add<transform::CanonicalizeEntryPointIO>();
fuzzers::CommonFuzzer fuzzer(InputFormat::kWGSL, OutputFormat::kSpv);
fuzzer.SetTransformManager(&transform_manager, std::move(transform_inputs));
diff --git a/fuzzers/tint_calculate_array_length_fuzzer.cc b/fuzzers/tint_calculate_array_length_fuzzer.cc
deleted file mode 100644
index 35df1c3..0000000
--- a/fuzzers/tint_calculate_array_length_fuzzer.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2021 The Tint Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "fuzzers/tint_common_fuzzer.h"
-
-namespace tint {
-namespace fuzzers {
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- transform::Manager transform_manager;
- transform_manager.Add<transform::CalculateArrayLength>();
-
- fuzzers::CommonFuzzer fuzzer(InputFormat::kWGSL, OutputFormat::kSpv);
- fuzzer.SetTransformManager(&transform_manager, {});
-
- return fuzzer.Run(data, size);
-}
-
-} // namespace fuzzers
-} // namespace tint
diff --git a/fuzzers/tint_canonicalize_entry_point_io_fuzzer.cc b/fuzzers/tint_canonicalize_entry_point_io_fuzzer.cc
deleted file mode 100644
index 263aa8a..0000000
--- a/fuzzers/tint_canonicalize_entry_point_io_fuzzer.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2021 The Tint Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "fuzzers/tint_common_fuzzer.h"
-
-namespace tint {
-namespace fuzzers {
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- transform::Manager transform_manager;
- transform_manager.Add<transform::CanonicalizeEntryPointIO>();
-
- fuzzers::CommonFuzzer fuzzer(InputFormat::kWGSL, OutputFormat::kSpv);
- fuzzer.SetTransformManager(&transform_manager, {});
-
- return fuzzer.Run(data, size);
-}
-
-} // namespace fuzzers
-} // namespace tint
diff --git a/fuzzers/tint_emit_vertex_point_size_fuzzer.cc b/fuzzers/tint_emit_vertex_point_size_fuzzer.cc
index 3b39437..d5ab5b4 100644
--- a/fuzzers/tint_emit_vertex_point_size_fuzzer.cc
+++ b/fuzzers/tint_emit_vertex_point_size_fuzzer.cc
@@ -12,6 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// TODO(tint:753): Remove this fuzzer once that transform is only
+// being used from sanitizers.
+
#include "fuzzers/tint_common_fuzzer.h"
namespace tint {
diff --git a/include/tint/tint.h b/include/tint/tint.h
index 44d85f3..ae0ff17 100644
--- a/include/tint/tint.h
+++ b/include/tint/tint.h
@@ -26,9 +26,7 @@
#include "src/sem/type_manager.h"
#include "src/transform/binding_remapper.h"
#include "src/transform/bound_array_accessors.h"
-#include "src/transform/calculate_array_length.h"
-#include "src/transform/canonicalize_entry_point_io.h"
-#include "src/transform/emit_vertex_point_size.h"
+#include "src/transform/emit_vertex_point_size.h" // TODO(tint:753): Remove once transform used by sanitizers
#include "src/transform/first_index_offset.h"
#include "src/transform/manager.h"
#include "src/transform/renamer.h"
