spirv-fuzz: Move ApplyTransformation to .cpp file (#4258)
Sometimes, you need to change these functions during debugging (e.g.,
figure out why the transformation is inapplicable). When that happens,
you need to recompile the whole fuzzer just because these functions
are in the header file. This PR fixes the situation.
diff --git a/source/fuzz/fuzzer_pass.cpp b/source/fuzz/fuzzer_pass.cpp
index 486f18f..f67efc6 100644
--- a/source/fuzz/fuzzer_pass.cpp
+++ b/source/fuzz/fuzzer_pass.cpp
@@ -184,6 +184,35 @@
}
}
+void FuzzerPass::ApplyTransformation(const Transformation& transformation) {
+ assert(transformation.IsApplicable(GetIRContext(),
+ *GetTransformationContext()) &&
+ "Transformation should be applicable by construction.");
+ transformation.Apply(GetIRContext(), GetTransformationContext());
+ auto transformation_message = transformation.ToMessage();
+ assert(transformation_message.transformation_case() !=
+ protobufs::Transformation::TRANSFORMATION_NOT_SET &&
+ "Bad transformation.");
+ *GetTransformations()->add_transformation() =
+ std::move(transformation_message);
+}
+
+bool FuzzerPass::MaybeApplyTransformation(
+ const Transformation& transformation) {
+ if (transformation.IsApplicable(GetIRContext(),
+ *GetTransformationContext())) {
+ transformation.Apply(GetIRContext(), GetTransformationContext());
+ auto transformation_message = transformation.ToMessage();
+ assert(transformation_message.transformation_case() !=
+ protobufs::Transformation::TRANSFORMATION_NOT_SET &&
+ "Bad transformation.");
+ *GetTransformations()->add_transformation() =
+ std::move(transformation_message);
+ return true;
+ }
+ return false;
+}
+
uint32_t FuzzerPass::FindOrCreateBoolType() {
if (auto existing_id = fuzzerutil::MaybeGetBoolType(GetIRContext())) {
return existing_id;
diff --git a/source/fuzz/fuzzer_pass.h b/source/fuzz/fuzzer_pass.h
index da3f239..ec25485 100644
--- a/source/fuzz/fuzzer_pass.h
+++ b/source/fuzz/fuzzer_pass.h
@@ -106,37 +106,13 @@
// A generic helper for applying a transformation that should be applicable
// by construction, and adding it to the sequence of applied transformations.
- void ApplyTransformation(const Transformation& transformation) {
- assert(transformation.IsApplicable(GetIRContext(),
- *GetTransformationContext()) &&
- "Transformation should be applicable by construction.");
- transformation.Apply(GetIRContext(), GetTransformationContext());
- protobufs::Transformation transformation_message =
- transformation.ToMessage();
- assert(transformation_message.transformation_case() !=
- protobufs::Transformation::TRANSFORMATION_NOT_SET &&
- "Bad transformation.");
- *GetTransformations()->add_transformation() = transformation_message;
- }
+ void ApplyTransformation(const Transformation& transformation);
// A generic helper for applying a transformation only if it is applicable.
// If it is applicable, the transformation is applied and then added to the
// sequence of applied transformations and the function returns true.
// Otherwise, the function returns false.
- bool MaybeApplyTransformation(const Transformation& transformation) {
- if (transformation.IsApplicable(GetIRContext(),
- *GetTransformationContext())) {
- transformation.Apply(GetIRContext(), GetTransformationContext());
- protobufs::Transformation transformation_message =
- transformation.ToMessage();
- assert(transformation_message.transformation_case() !=
- protobufs::Transformation::TRANSFORMATION_NOT_SET &&
- "Bad transformation.");
- *GetTransformations()->add_transformation() = transformation_message;
- return true;
- }
- return false;
- }
+ bool MaybeApplyTransformation(const Transformation& transformation);
// Returns the id of an OpTypeBool instruction. If such an instruction does
// not exist, a transformation is applied to add it.
diff --git a/source/fuzz/transformation_composite_insert.cpp b/source/fuzz/transformation_composite_insert.cpp
index 14c3a1b..05162bf 100644
--- a/source/fuzz/transformation_composite_insert.cpp
+++ b/source/fuzz/transformation_composite_insert.cpp
@@ -14,7 +14,6 @@
#include "transformation_composite_insert.h"
-#include "source/fuzz/fuzzer_pass_add_composite_inserts.h"
#include "source/fuzz/fuzzer_util.h"
#include "source/fuzz/instruction_descriptor.h"
