Skip to content

Commit 3609987

Browse files
[Minor Fix] change default client api from vulkan to opencl (#568)
1 parent 944d56e commit 3609987

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

include/imex/Transforms/Passes.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def InsertGPUAllocs : Pass<"insert-gpu-allocs", "::mlir::func::FuncOp"> {
3838
"::mlir::gpu::GPUDialect",
3939
"::mlir::arith::ArithDialect"];
4040
let options = [
41-
Option<"clientAPI", "client-api", "std::string", /*default=*/"\"vulkan\"",
41+
Option<"clientAPI", "client-api", "std::string", /*default=*/"\"opencl\"",
4242
"The client API to use for inserting gpu allocs">
4343
];
4444
}
@@ -47,7 +47,7 @@ def SetSPIRVCapabilities : Pass<"set-spirv-capabilities"> {
4747
let summary = "Sets Spirv capabilities";
4848
let constructor = "imex::createSetSPIRVCapabilitiesPass()";
4949
let options = [
50-
Option<"clientAPI", "client-api", "std::string", /*default=*/"\"vulkan\"",
50+
Option<"clientAPI", "client-api", "std::string", /*default=*/"\"opencl\"",
5151
"The client API to use for setting Spirv capabilities">
5252
];
5353
}
@@ -58,7 +58,7 @@ def SetSPIRVAbiAttribute : Pass<"set-spirv-abi-attrs", "::mlir::gpu::GPUModuleOp
5858
let dependentDialects = ["::mlir::gpu::GPUDialect",
5959
"::mlir::spirv::SPIRVDialect"];
6060
let options = [
61-
Option<"clientAPI", "client-api", "std::string", /*default=*/"\"vulkan\"",
61+
Option<"clientAPI", "client-api", "std::string", /*default=*/"\"opencl\"",
6262
"The client API to use for setting Spirv Abi attribute">
6363
];
6464
}

lib/Transforms/SetSPIRVCapabilities.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,16 @@ namespace {
3030
struct SetSPIRVCapabilitiesPass
3131
: public imex::impl::SetSPIRVCapabilitiesBase<SetSPIRVCapabilitiesPass> {
3232
public:
33-
explicit SetSPIRVCapabilitiesPass() { m_clientAPI = "vulkan"; }
3433
explicit SetSPIRVCapabilitiesPass(const mlir::StringRef &clientAPI)
3534
: m_clientAPI(clientAPI) {}
3635

3736
mlir::LogicalResult initializeOptions(mlir::StringRef options) override {
3837
if (failed(Pass::initializeOptions(options)))
3938
return mlir::failure();
4039

41-
if (clientAPI == "opencl") {
42-
m_clientAPI = "opencl";
43-
}
44-
4540
if (clientAPI != "vulkan" && clientAPI != "opencl")
4641
return mlir::failure();
42+
m_clientAPI = clientAPI;
4743

4844
return mlir::success();
4945
}
@@ -111,7 +107,11 @@ struct SetSPIRVCapabilitiesPass
111107
} // namespace
112108

113109
namespace imex {
110+
std::unique_ptr<mlir::Pass>
111+
createSetSPIRVCapabilitiesPass(mlir::StringRef api) {
112+
return std::make_unique<SetSPIRVCapabilitiesPass>(api);
113+
}
114114
std::unique_ptr<mlir::Pass> createSetSPIRVCapabilitiesPass() {
115-
return std::make_unique<SetSPIRVCapabilitiesPass>();
115+
return createSetSPIRVCapabilitiesPass("opencl");
116116
}
117117
} // namespace imex

test/PlaidML/OpTest.Conv1D.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module @conv_1d {
5454
func.func private @printMemrefF32(%ptr : tensor<*xf32>)
5555
}
5656
// CHECK: Unranked Memref base@ = {{(0x)?[-9a-f]*}}
57-
// CHECK-NEXT: 76
57+
// CHECK-NEXT: [76
5858
// CHECK-NEXT: 99
5959
// CHECK-NEXT: 122
6060
// CHECK-NEXT: 145

0 commit comments

Comments
 (0)