From a297340d9ef868662f6ac096001963c34862e367 Mon Sep 17 00:00:00 2001 From: Eugene Zhulenev Date: Tue, 27 Oct 2020 17:02:10 -0700 Subject: [PATCH] [mlir] Fix stack-use-after-scope in cuda/vulkan cpu runners +fix rocm runner Reviewed By: mehdi_amini Differential Revision: https://reviews.llvm.org/D90274 --- mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp | 2 +- mlir/tools/mlir-rocm-runner/mlir-rocm-runner.cpp | 6 +++++- mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp | 4 ++-- mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp b/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp index cfffaaa..cdadf3d 100644 --- a/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp +++ b/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp @@ -138,7 +138,7 @@ int main(int argc, char **argv) { mlir::initializeLLVMPasses(); mlir::JitRunnerConfig jitRunnerConfig; - jitRunnerConfig.mlirTransformer = &runMLIRPasses; + jitRunnerConfig.mlirTransformer = runMLIRPasses; return mlir::JitRunnerMain(argc, argv, jitRunnerConfig); } diff --git a/mlir/tools/mlir-rocm-runner/mlir-rocm-runner.cpp b/mlir/tools/mlir-rocm-runner/mlir-rocm-runner.cpp index 8cd391a..2277ecc 100644 --- a/mlir/tools/mlir-rocm-runner/mlir-rocm-runner.cpp +++ b/mlir/tools/mlir-rocm-runner/mlir-rocm-runner.cpp @@ -334,5 +334,9 @@ int main(int argc, char **argv) { LLVMInitializeAMDGPUAsmPrinter(); mlir::initializeLLVMPasses(); - return mlir::JitRunnerMain(argc, argv, &runMLIRPasses); + + mlir::JitRunnerConfig jitRunnerConfig; + jitRunnerConfig.mlirTransformer = runMLIRPasses; + + return mlir::JitRunnerMain(argc, argv, jitRunnerConfig); } diff --git a/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp b/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp index cc0f503f..5deb52c 100644 --- a/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp +++ b/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp @@ -87,8 +87,8 @@ int main(int argc, char **argv) { mlir::initializeLLVMPasses(); mlir::JitRunnerConfig jitRunnerConfig; - jitRunnerConfig.mlirTransformer = &runMLIRPasses; - jitRunnerConfig.llvmModuleBuilder = &convertMLIRModule; + jitRunnerConfig.mlirTransformer = runMLIRPasses; + jitRunnerConfig.llvmModuleBuilder = convertMLIRModule; return mlir::JitRunnerMain(argc, argv, jitRunnerConfig); } diff --git a/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp b/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp index 322f949..8b00bae 100644 --- a/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp +++ b/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp @@ -59,7 +59,7 @@ int main(int argc, char **argv) { mlir::initializeLLVMPasses(); mlir::JitRunnerConfig jitRunnerConfig; - jitRunnerConfig.mlirTransformer = &runMLIRPasses; + jitRunnerConfig.mlirTransformer = runMLIRPasses; return mlir::JitRunnerMain(argc, argv, jitRunnerConfig); } -- 2.7.4