[shuffle] Rename SPIR-V writer sources
Rename `generator` to `writer`, drop the `impl` and `ir` suffixes, and
remove the prefix from test file names.
Bug: tint:1988
Change-Id: I436a4b9a83f3a51a2ec0c7a476956dfdf0bb2f2f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/142360
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Auto-Submit: James Price <jrprice@google.com>
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn
index 9e40beb..fa18487 100644
--- a/src/tint/BUILD.gn
+++ b/src/tint/BUILD.gn
@@ -1087,8 +1087,8 @@
if (tint_build_ir) {
sources += [
- "lang/spirv/writer/generator_impl_ir.cc",
- "lang/spirv/writer/generator_impl_ir.h",
+ "lang/spirv/writer/writer.cc",
+ "lang/spirv/writer/writer.h",
]
deps += [
":libtint_ir_builder_src",
@@ -2079,27 +2079,27 @@
if (tint_build_ir) {
sources += [
- "lang/spirv/writer/generator_impl_ir_access_test.cc",
- "lang/spirv/writer/generator_impl_ir_atomic_builtin_test.cc",
- "lang/spirv/writer/generator_impl_ir_binary_test.cc",
- "lang/spirv/writer/generator_impl_ir_bitcast_test.cc",
- "lang/spirv/writer/generator_impl_ir_builtin_test.cc",
- "lang/spirv/writer/generator_impl_ir_constant_test.cc",
- "lang/spirv/writer/generator_impl_ir_construct_test.cc",
- "lang/spirv/writer/generator_impl_ir_convert_test.cc",
- "lang/spirv/writer/generator_impl_ir_discard_test.cc",
- "lang/spirv/writer/generator_impl_ir_function_test.cc",
- "lang/spirv/writer/generator_impl_ir_if_test.cc",
- "lang/spirv/writer/generator_impl_ir_let_test.cc",
- "lang/spirv/writer/generator_impl_ir_loop_test.cc",
- "lang/spirv/writer/generator_impl_ir_switch_test.cc",
- "lang/spirv/writer/generator_impl_ir_swizzle_test.cc",
- "lang/spirv/writer/generator_impl_ir_test.cc",
- "lang/spirv/writer/generator_impl_ir_texture_builtin_test.cc",
- "lang/spirv/writer/generator_impl_ir_type_test.cc",
- "lang/spirv/writer/generator_impl_ir_unary_test.cc",
- "lang/spirv/writer/generator_impl_ir_var_test.cc",
- "lang/spirv/writer/test_helper_ir.h",
+ "lang/spirv/writer/access_test.cc",
+ "lang/spirv/writer/atomic_builtin_test.cc",
+ "lang/spirv/writer/binary_test.cc",
+ "lang/spirv/writer/bitcast_test.cc",
+ "lang/spirv/writer/builtin_test.cc",
+ "lang/spirv/writer/constant_test.cc",
+ "lang/spirv/writer/construct_test.cc",
+ "lang/spirv/writer/convert_test.cc",
+ "lang/spirv/writer/discard_test.cc",
+ "lang/spirv/writer/function_test.cc",
+ "lang/spirv/writer/if_test.cc",
+ "lang/spirv/writer/let_test.cc",
+ "lang/spirv/writer/loop_test.cc",
+ "lang/spirv/writer/switch_test.cc",
+ "lang/spirv/writer/swizzle_test.cc",
+ "lang/spirv/writer/test_helper.h",
+ "lang/spirv/writer/texture_builtin_test.cc",
+ "lang/spirv/writer/type_test.cc",
+ "lang/spirv/writer/unary_test.cc",
+ "lang/spirv/writer/var_test.cc",
+ "lang/spirv/writer/writer_test.cc",
]
deps += [ ":libtint_ir_src" ]
}
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 0363ef7..fe7e0c0 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -689,8 +689,8 @@
ir/transform/shader_io_spirv.h
ir/transform/var_for_dynamic_index.cc
ir/transform/var_for_dynamic_index.h
- lang/spirv/writer/generator_impl_ir.cc
- lang/spirv/writer/generator_impl_ir.h
+ lang/spirv/writer/writer.cc
+ lang/spirv/writer/writer.h
)
endif()
endif()
@@ -1343,27 +1343,27 @@
ir/transform/merge_return_test.cc
ir/transform/shader_io_spirv_test.cc
ir/transform/var_for_dynamic_index_test.cc
- lang/spirv/writer/generator_impl_ir_access_test.cc
- lang/spirv/writer/generator_impl_ir_atomic_builtin_test.cc
- lang/spirv/writer/generator_impl_ir_binary_test.cc
- lang/spirv/writer/generator_impl_ir_bitcast_test.cc
- lang/spirv/writer/generator_impl_ir_builtin_test.cc
- lang/spirv/writer/generator_impl_ir_constant_test.cc
- lang/spirv/writer/generator_impl_ir_construct_test.cc
- lang/spirv/writer/generator_impl_ir_convert_test.cc
- lang/spirv/writer/generator_impl_ir_discard_test.cc
- lang/spirv/writer/generator_impl_ir_function_test.cc
- lang/spirv/writer/generator_impl_ir_if_test.cc
- lang/spirv/writer/generator_impl_ir_let_test.cc
- lang/spirv/writer/generator_impl_ir_loop_test.cc
- lang/spirv/writer/generator_impl_ir_switch_test.cc
- lang/spirv/writer/generator_impl_ir_swizzle_test.cc
- lang/spirv/writer/generator_impl_ir_test.cc
- lang/spirv/writer/generator_impl_ir_texture_builtin_test.cc
- lang/spirv/writer/generator_impl_ir_type_test.cc
- lang/spirv/writer/generator_impl_ir_unary_test.cc
- lang/spirv/writer/generator_impl_ir_var_test.cc
- lang/spirv/writer/test_helper_ir.h
+ lang/spirv/writer/access_test.cc
+ lang/spirv/writer/atomic_builtin_test.cc
+ lang/spirv/writer/binary_test.cc
+ lang/spirv/writer/bitcast_test.cc
+ lang/spirv/writer/builtin_test.cc
+ lang/spirv/writer/constant_test.cc
+ lang/spirv/writer/construct_test.cc
+ lang/spirv/writer/convert_test.cc
+ lang/spirv/writer/discard_test.cc
+ lang/spirv/writer/function_test.cc
+ lang/spirv/writer/if_test.cc
+ lang/spirv/writer/let_test.cc
+ lang/spirv/writer/loop_test.cc
+ lang/spirv/writer/switch_test.cc
+ lang/spirv/writer/swizzle_test.cc
+ lang/spirv/writer/test_helper.h
+ lang/spirv/writer/texture_builtin_test.cc
+ lang/spirv/writer/type_test.cc
+ lang/spirv/writer/unary_test.cc
+ lang/spirv/writer/var_test.cc
+ lang/spirv/writer/writer_test.cc
)
endif()
endif()
diff --git a/src/tint/lang/spirv/ast_writer/generator.cc b/src/tint/lang/spirv/ast_writer/generator.cc
index 0cb741a..d55a853 100644
--- a/src/tint/lang/spirv/ast_writer/generator.cc
+++ b/src/tint/lang/spirv/ast_writer/generator.cc
@@ -18,9 +18,9 @@
#include "src/tint/lang/spirv/ast_writer/generator_impl.h"
#if TINT_BUILD_IR
-#include "src/tint/ir/from_program.h" // nogncheck
-#include "src/tint/lang/spirv/writer/generator_impl_ir.h" // nogncheck
-#endif // TINT_BUILD_IR
+#include "src/tint/ir/from_program.h" // nogncheck
+#include "src/tint/lang/spirv/writer/writer.h" // nogncheck
+#endif // TINT_BUILD_IR
namespace tint::writer::spirv {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_access_test.cc b/src/tint/lang/spirv/writer/access_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_access_test.cc
rename to src/tint/lang/spirv/writer/access_test.cc
index 051dbab..d511269 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_access_test.cc
+++ b/src/tint/lang/spirv/writer/access_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_atomic_builtin_test.cc b/src/tint/lang/spirv/writer/atomic_builtin_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_atomic_builtin_test.cc
rename to src/tint/lang/spirv/writer/atomic_builtin_test.cc
index 7657386..e68cb8d 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_atomic_builtin_test.cc
+++ b/src/tint/lang/spirv/writer/atomic_builtin_test.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "src/tint/lang/core/type/builtin_structs.h"
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
#include "src/tint/lang/core/builtin/function.h"
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_binary_test.cc b/src/tint/lang/spirv/writer/binary_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_binary_test.cc
rename to src/tint/lang/spirv/writer/binary_test.cc
index a1745fb..b18a46f 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_binary_test.cc
+++ b/src/tint/lang/spirv/writer/binary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
#include "src/tint/ir/binary.h"
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_bitcast_test.cc b/src/tint/lang/spirv/writer/bitcast_test.cc
similarity index 98%
rename from src/tint/lang/spirv/writer/generator_impl_ir_bitcast_test.cc
rename to src/tint/lang/spirv/writer/bitcast_test.cc
index 020bb0f..84d31d1 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_bitcast_test.cc
+++ b/src/tint/lang/spirv/writer/bitcast_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_builtin_test.cc b/src/tint/lang/spirv/writer/builtin_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_builtin_test.cc
rename to src/tint/lang/spirv/writer/builtin_test.cc
index 2869926..2340fe8 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_builtin_test.cc
+++ b/src/tint/lang/spirv/writer/builtin_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
#include "src/tint/lang/core/builtin/function.h"
#include "src/tint/lang/core/type/builtin_structs.h"
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_constant_test.cc b/src/tint/lang/spirv/writer/constant_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_constant_test.cc
rename to src/tint/lang/spirv/writer/constant_test.cc
index 4811dc7..fafa974 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_constant_test.cc
+++ b/src/tint/lang/spirv/writer/constant_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_construct_test.cc b/src/tint/lang/spirv/writer/construct_test.cc
similarity index 98%
rename from src/tint/lang/spirv/writer/generator_impl_ir_construct_test.cc
rename to src/tint/lang/spirv/writer/construct_test.cc
index ae11bf2..763e21d 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_construct_test.cc
+++ b/src/tint/lang/spirv/writer/construct_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_convert_test.cc b/src/tint/lang/spirv/writer/convert_test.cc
similarity index 98%
rename from src/tint/lang/spirv/writer/generator_impl_ir_convert_test.cc
rename to src/tint/lang/spirv/writer/convert_test.cc
index 2c5c2a6..49c8c4b 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_convert_test.cc
+++ b/src/tint/lang/spirv/writer/convert_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_discard_test.cc b/src/tint/lang/spirv/writer/discard_test.cc
similarity index 97%
rename from src/tint/lang/spirv/writer/generator_impl_ir_discard_test.cc
rename to src/tint/lang/spirv/writer/discard_test.cc
index 2dd5774..a571327 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_discard_test.cc
+++ b/src/tint/lang/spirv/writer/discard_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_function_test.cc b/src/tint/lang/spirv/writer/function_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_function_test.cc
rename to src/tint/lang/spirv/writer/function_test.cc
index 5f4cbd4..a2b1794 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_function_test.cc
+++ b/src/tint/lang/spirv/writer/function_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_if_test.cc b/src/tint/lang/spirv/writer/if_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_if_test.cc
rename to src/tint/lang/spirv/writer/if_test.cc
index b56f7b0..2f36a44 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_if_test.cc
+++ b/src/tint/lang/spirv/writer/if_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_let_test.cc b/src/tint/lang/spirv/writer/let_test.cc
similarity index 96%
rename from src/tint/lang/spirv/writer/generator_impl_ir_let_test.cc
rename to src/tint/lang/spirv/writer/let_test.cc
index b97ae2e..e01e97c 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_let_test.cc
+++ b/src/tint/lang/spirv/writer/let_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_loop_test.cc b/src/tint/lang/spirv/writer/loop_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_loop_test.cc
rename to src/tint/lang/spirv/writer/loop_test.cc
index dd8dc72..35fdd47 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_loop_test.cc
+++ b/src/tint/lang/spirv/writer/loop_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_switch_test.cc b/src/tint/lang/spirv/writer/switch_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_switch_test.cc
rename to src/tint/lang/spirv/writer/switch_test.cc
index a5fb5af..d427d5a 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_switch_test.cc
+++ b/src/tint/lang/spirv/writer/switch_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
using namespace tint::number_suffixes; // NOLINT
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_swizzle_test.cc b/src/tint/lang/spirv/writer/swizzle_test.cc
similarity index 97%
rename from src/tint/lang/spirv/writer/generator_impl_ir_swizzle_test.cc
rename to src/tint/lang/spirv/writer/swizzle_test.cc
index 7c8619d..d31be19 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_swizzle_test.cc
+++ b/src/tint/lang/spirv/writer/swizzle_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/test_helper_ir.h b/src/tint/lang/spirv/writer/test_helper.h
similarity index 97%
rename from src/tint/lang/spirv/writer/test_helper_ir.h
rename to src/tint/lang/spirv/writer/test_helper.h
index 5ea33e3..5d82c33 100644
--- a/src/tint/lang/spirv/writer/test_helper_ir.h
+++ b/src/tint/lang/spirv/writer/test_helper.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_SPIRV_WRITER_TEST_HELPER_IR_H_
-#define SRC_TINT_LANG_SPIRV_WRITER_TEST_HELPER_IR_H_
+#ifndef SRC_TINT_LANG_SPIRV_WRITER_TEST_HELPER_H_
+#define SRC_TINT_LANG_SPIRV_WRITER_TEST_HELPER_H_
#include <string>
#include <utility>
@@ -25,7 +25,7 @@
#include "src/tint/ir/builder.h"
#include "src/tint/ir/validator.h"
#include "src/tint/lang/spirv/ast_writer/spv_dump.h"
-#include "src/tint/lang/spirv/writer/generator_impl_ir.h"
+#include "src/tint/lang/spirv/writer/writer.h"
namespace tint::writer::spirv {
@@ -236,4 +236,4 @@
} // namespace tint::writer::spirv
-#endif // SRC_TINT_LANG_SPIRV_WRITER_TEST_HELPER_IR_H_
+#endif // SRC_TINT_LANG_SPIRV_WRITER_TEST_HELPER_H_
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_texture_builtin_test.cc b/src/tint/lang/spirv/writer/texture_builtin_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_texture_builtin_test.cc
rename to src/tint/lang/spirv/writer/texture_builtin_test.cc
index 221f383..b29c5d1 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_texture_builtin_test.cc
+++ b/src/tint/lang/spirv/writer/texture_builtin_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
#include "src/tint/lang/core/builtin/function.h"
#include "src/tint/lang/core/type/depth_multisampled_texture.h"
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_type_test.cc b/src/tint/lang/spirv/writer/type_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_type_test.cc
rename to src/tint/lang/spirv/writer/type_test.cc
index 6bc9e59..530e524 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_type_test.cc
+++ b/src/tint/lang/spirv/writer/type_test.cc
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "src/tint/lang/core/type/type.h"
#include "src/tint/lang/core/type/bool.h"
#include "src/tint/lang/core/type/depth_multisampled_texture.h"
#include "src/tint/lang/core/type/depth_texture.h"
@@ -21,10 +22,9 @@
#include "src/tint/lang/core/type/multisampled_texture.h"
#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
-#include "src/tint/lang/core/type/type.h"
#include "src/tint/lang/core/type/u32.h"
#include "src/tint/lang/core/type/void.h"
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_unary_test.cc b/src/tint/lang/spirv/writer/unary_test.cc
similarity index 97%
rename from src/tint/lang/spirv/writer/generator_impl_ir_unary_test.cc
rename to src/tint/lang/spirv/writer/unary_test.cc
index 2fef5b1..ef93dc7 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_unary_test.cc
+++ b/src/tint/lang/spirv/writer/unary_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
#include "src/tint/ir/unary.h"
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_var_test.cc b/src/tint/lang/spirv/writer/var_test.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir_var_test.cc
rename to src/tint/lang/spirv/writer/var_test.cc
index e7fc227..c179959 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_var_test.cc
+++ b/src/tint/lang/spirv/writer/var_test.cc
@@ -14,7 +14,7 @@
#include "src/tint/lang/core/type/pointer.h"
#include "src/tint/lang/core/type/sampled_texture.h"
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
namespace tint::writer::spirv {
namespace {
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir.cc b/src/tint/lang/spirv/writer/writer.cc
similarity index 99%
rename from src/tint/lang/spirv/writer/generator_impl_ir.cc
rename to src/tint/lang/spirv/writer/writer.cc
index 2bae8d4..a9a0984 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir.cc
+++ b/src/tint/lang/spirv/writer/writer.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/generator_impl_ir.h"
+#include "src/tint/lang/spirv/writer/writer.h"
#include <utility>
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir.h b/src/tint/lang/spirv/writer/writer.h
similarity index 98%
rename from src/tint/lang/spirv/writer/generator_impl_ir.h
rename to src/tint/lang/spirv/writer/writer.h
index 785582a..c422edb 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir.h
+++ b/src/tint/lang/spirv/writer/writer.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef SRC_TINT_LANG_SPIRV_WRITER_GENERATOR_IMPL_IR_H_
-#define SRC_TINT_LANG_SPIRV_WRITER_GENERATOR_IMPL_IR_H_
+#ifndef SRC_TINT_LANG_SPIRV_WRITER_WRITER_H_
+#define SRC_TINT_LANG_SPIRV_WRITER_WRITER_H_
#include <vector>
@@ -343,4 +343,4 @@
} // namespace tint::writer::spirv
-#endif // SRC_TINT_LANG_SPIRV_WRITER_GENERATOR_IMPL_IR_H_
+#endif // SRC_TINT_LANG_SPIRV_WRITER_WRITER_H_
diff --git a/src/tint/lang/spirv/writer/generator_impl_ir_test.cc b/src/tint/lang/spirv/writer/writer_test.cc
similarity index 97%
rename from src/tint/lang/spirv/writer/generator_impl_ir_test.cc
rename to src/tint/lang/spirv/writer/writer_test.cc
index 5b40c98..048f047 100644
--- a/src/tint/lang/spirv/writer/generator_impl_ir_test.cc
+++ b/src/tint/lang/spirv/writer/writer_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/tint/lang/spirv/writer/test_helper_ir.h"
+#include "src/tint/lang/spirv/writer/test_helper.h"
#include "gmock/gmock.h"
