[mlir][SPIRV] Add spirv.vce when create spirv.module in GPUToSPIRV

[oojahooo]

In GPUToSPIRV conversion, we can pass the spirv.vce triple obtained from spirv.target_env when creating a spirv.module in GPUModuleConversion::matchAndRewrite because spirv.target_env must derived by executing lookupTargetEnvOrDefault

[github-actions]

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

[llvmbot]

@llvm/pr-subscribers-mlir-spirv

@llvm/pr-subscribers-mlir

Author: Jaeho Kim (oojahooo)

Changes

In GPUToSPIRV conversion, we can pass the spirv.vce triple obtained from spirv.target_env when creating a spirv.module in GPUModuleConversion::matchAndRewrite because spirv.target_env must derived by executing lookupTargetEnvOrDefault

---

Full diff: https://github.com/llvm/llvm-project/pull/147267.diff

1 Files Affected:

• (modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp (+2-2)

diff --git a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
index b99ed261ecfa3..9c9afef8c226f 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
+++ b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
@@ -368,8 +368,8 @@ LogicalResult GPUModuleConversion::matchAndRewrite(
   // Add a keyword to the module name to avoid symbolic conflict.
   std::string spvModuleName = (kSPIRVModule + moduleOp.getName()).str();
   auto spvModule = rewriter.create<spirv::ModuleOp>(
-      moduleOp.getLoc(), addressingModel, *memoryModel, std::nullopt,
-      StringRef(spvModuleName));
+      moduleOp.getLoc(), addressingModel, *memoryModel,
+      targetEnv.getAttr().getTripleAttr(), StringRef(spvModuleName));
 
   // Move the region from the module op into the SPIR-V module.
   Region &spvModuleRegion = spvModule.getRegion();

[llvmbot]

@llvm/pr-subscribers-mlir-gpu

Author: Jaeho Kim (oojahooo)

Changes

In GPUToSPIRV conversion, we can pass the spirv.vce triple obtained from spirv.target_env when creating a spirv.module in GPUModuleConversion::matchAndRewrite because spirv.target_env must derived by executing lookupTargetEnvOrDefault

---

Full diff: https://github.com/llvm/llvm-project/pull/147267.diff

1 Files Affected:

• (modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp (+2-2)

diff --git a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
index b99ed261ecfa3..9c9afef8c226f 100644
--- a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
+++ b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
@@ -368,8 +368,8 @@ LogicalResult GPUModuleConversion::matchAndRewrite(
   // Add a keyword to the module name to avoid symbolic conflict.
   std::string spvModuleName = (kSPIRVModule + moduleOp.getName()).str();
   auto spvModule = rewriter.create<spirv::ModuleOp>(
-      moduleOp.getLoc(), addressingModel, *memoryModel, std::nullopt,
-      StringRef(spvModuleName));
+      moduleOp.getLoc(), addressingModel, *memoryModel,
+      targetEnv.getAttr().getTripleAttr(), StringRef(spvModuleName));
 
   // Move the region from the module op into the SPIR-V module.
   Region &spvModuleRegion = spvModule.getRegion();

[kuhar]

Can you add a test?