[mlir][spirv] Add .spv extension to validation files #153440
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
@llvm/pr-subscribers-mlir-spirv Author: Igor Wodiany (IgWod-IMG) ChangesFull diff: https://github.com/llvm/llvm-project/pull/153440.diff 3 Files Affected:
diff --git a/mlir/include/mlir/Target/SPIRV/Serialization.h b/mlir/include/mlir/Target/SPIRV/Serialization.h
index bc58093ead864..e474101402e58 100644
--- a/mlir/include/mlir/Target/SPIRV/Serialization.h
+++ b/mlir/include/mlir/Target/SPIRV/Serialization.h
@@ -38,14 +38,14 @@ struct SerializationOptions {
/// or an absolute path followed by the prefix. For example:
///
/// * "foo" - Create files with a `foo` prefix in the current working
- /// directory. For example: `fooXYZ123`, `fooABC456` ... `fooXXXXXX`.
- /// The last 6 characters will be a unique combination as
- /// generated by `llvm::sys::fs::createUniqueFile`.
+ /// directory. For example: `fooXYZ123.spv`, `fooABC456.spv` ...
+ /// `fooXXXXXX.spv`. The last 6 characters will be a unique combination
+ /// as generated by `llvm::sys::fs::createUniqueFile`.
///
/// * "my/dir/foo" - Create files in `my/dir` with a `foo` prefix. The
- /// `my/dir` need to exists. For example: `fooXYZ123`, `fooABC456` ...
- /// `fooXXXXXX` will be created and stored in `/my/dir`. Filenames
- /// follow the same pattern as above.
+ /// `my/dir` need to exists. For example: `fooXYZ123.spv`,
+ /// `fooABC456.spv` ... `fooXXXXXX.spv` will be created and stored in
+ /// `/my/dir`. Filenames follow the same pattern as above.
///
/// * "/home/user/my/dir" - Same as above but using an absolute path.
std::string validationFilePrefix = "";
diff --git a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp
index 4391ee714c519..796354e154c02 100644
--- a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp
+++ b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp
@@ -106,7 +106,7 @@ serializeModule(spirv::ModuleOp moduleOp, raw_ostream &output,
int fd = 0;
std::error_code errorCode = llvm::sys::fs::createUniqueFile(
- options.validationFilePrefix + "%%%%%%", fd, filename);
+ options.validationFilePrefix + "%%%%%%.spv", fd, filename);
if (errorCode)
return moduleOp.emitError("error creating validation output file: ")
<< errorCode.message() << "\n";
diff --git a/mlir/test/Target/SPIRV/mlir-translate.mlir b/mlir/test/Target/SPIRV/mlir-translate.mlir
index 9f91fc97dcaed..cbce351dd35b5 100644
--- a/mlir/test/Target/SPIRV/mlir-translate.mlir
+++ b/mlir/test/Target/SPIRV/mlir-translate.mlir
@@ -5,7 +5,7 @@
// RUN: rm -rf %t
// RUN: mkdir %t && mlir-translate --serialize-spirv --no-implicit-module \
// RUN: --split-input-file --spirv-save-validation-files-with-prefix=%t/foo %s \
-// RUN: && ls %t | wc -l | FileCheck %s
+// RUN: && ls %t/foo*.spv | wc -l | FileCheck %s
// RUN: rm -rf %t
// CHECK: 4
|
Member
|
@llvm/pr-subscribers-mlir Author: Igor Wodiany (IgWod-IMG) ChangesFull diff: https://github.com/llvm/llvm-project/pull/153440.diff 3 Files Affected:
diff --git a/mlir/include/mlir/Target/SPIRV/Serialization.h b/mlir/include/mlir/Target/SPIRV/Serialization.h
index bc58093ead864..e474101402e58 100644
--- a/mlir/include/mlir/Target/SPIRV/Serialization.h
+++ b/mlir/include/mlir/Target/SPIRV/Serialization.h
@@ -38,14 +38,14 @@ struct SerializationOptions {
/// or an absolute path followed by the prefix. For example:
///
/// * "foo" - Create files with a `foo` prefix in the current working
- /// directory. For example: `fooXYZ123`, `fooABC456` ... `fooXXXXXX`.
- /// The last 6 characters will be a unique combination as
- /// generated by `llvm::sys::fs::createUniqueFile`.
+ /// directory. For example: `fooXYZ123.spv`, `fooABC456.spv` ...
+ /// `fooXXXXXX.spv`. The last 6 characters will be a unique combination
+ /// as generated by `llvm::sys::fs::createUniqueFile`.
///
/// * "my/dir/foo" - Create files in `my/dir` with a `foo` prefix. The
- /// `my/dir` need to exists. For example: `fooXYZ123`, `fooABC456` ...
- /// `fooXXXXXX` will be created and stored in `/my/dir`. Filenames
- /// follow the same pattern as above.
+ /// `my/dir` need to exists. For example: `fooXYZ123.spv`,
+ /// `fooABC456.spv` ... `fooXXXXXX.spv` will be created and stored in
+ /// `/my/dir`. Filenames follow the same pattern as above.
///
/// * "/home/user/my/dir" - Same as above but using an absolute path.
std::string validationFilePrefix = "";
diff --git a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp
index 4391ee714c519..796354e154c02 100644
--- a/mlir/lib/Target/SPIRV/TranslateRegistration.cpp
+++ b/mlir/lib/Target/SPIRV/TranslateRegistration.cpp
@@ -106,7 +106,7 @@ serializeModule(spirv::ModuleOp moduleOp, raw_ostream &output,
int fd = 0;
std::error_code errorCode = llvm::sys::fs::createUniqueFile(
- options.validationFilePrefix + "%%%%%%", fd, filename);
+ options.validationFilePrefix + "%%%%%%.spv", fd, filename);
if (errorCode)
return moduleOp.emitError("error creating validation output file: ")
<< errorCode.message() << "\n";
diff --git a/mlir/test/Target/SPIRV/mlir-translate.mlir b/mlir/test/Target/SPIRV/mlir-translate.mlir
index 9f91fc97dcaed..cbce351dd35b5 100644
--- a/mlir/test/Target/SPIRV/mlir-translate.mlir
+++ b/mlir/test/Target/SPIRV/mlir-translate.mlir
@@ -5,7 +5,7 @@
// RUN: rm -rf %t
// RUN: mkdir %t && mlir-translate --serialize-spirv --no-implicit-module \
// RUN: --split-input-file --spirv-save-validation-files-with-prefix=%t/foo %s \
-// RUN: && ls %t | wc -l | FileCheck %s
+// RUN: && ls %t/foo*.spv | wc -l | FileCheck %s
// RUN: rm -rf %t
// CHECK: 4
|
kuhar
approved these changes
Aug 13, 2025
Contributor
Author
|
It looks like that auto-merge ignores Test MLIR SPIR-V and do the merge once other CI checks pass. We probably should set it as required or something. |
Member
IMO that's fine since we don't have that much mileage on this check yet... worst case we can always revert or fix post-commit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.