[Mlir-commits] [mlir] 330838e - [mlir] Fix GpuToLLVM conversion pass after ControlFlow operations were split from Standard

[River Riddle]

Author: River Riddle
Date: 2022-02-06T15:10:03-08:00
New Revision: 330838eb907f2ac4bf6ba6c8fb18280de6e430d9

URL: https://github.com/llvm/llvm-project/commit/330838eb907f2ac4bf6ba6c8fb18280de6e430d9
DIFF: https://github.com/llvm/llvm-project/commit/330838eb907f2ac4bf6ba6c8fb18280de6e430d9.diff

LOG: [mlir] Fix GpuToLLVM conversion pass after ControlFlow operations were split from Standard

Added: 
    

Modified: 
    mlir/lib/Conversion/GPUCommon/CMakeLists.txt
    mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt
index 339afbf5a0af3..92eb95ab42e04 100644
--- a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt
@@ -31,6 +31,7 @@ add_mlir_conversion_library(MLIRGPUToGPURuntimeTransforms
   LINK_LIBS PUBLIC
   MLIRArithmeticToLLVM
   MLIRAsyncToLLVM
+  MLIRControlFlowToLLVM
   MLIRGPUTransforms
   MLIRIR
   MLIRLLVMCommonConversion

diff  --git a/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp b/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp
index 212453e8b3580..a30bfaf5cce4d 100644
--- a/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp
+++ b/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp
@@ -18,6 +18,7 @@
 #include "../PassDetail.h"
 #include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h"
 #include "mlir/Conversion/AsyncToLLVM/AsyncToLLVM.h"
+#include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h"
 #include "mlir/Conversion/LLVMCommon/ConversionTarget.h"
 #include "mlir/Conversion/LLVMCommon/Pattern.h"
 #include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h"
@@ -351,6 +352,7 @@ void GpuToLLVMConversionPass::runOnOperation() {
   target.addIllegalDialect<gpu::GPUDialect>();
 
   mlir::arith::populateArithmeticToLLVMConversionPatterns(converter, patterns);
+  mlir::cf::populateControlFlowToLLVMConversionPatterns(converter, patterns);
   populateVectorToLLVMConversionPatterns(converter, patterns);
   populateMemRefToLLVMConversionPatterns(converter, patterns);
   populateStdToLLVMConversionPatterns(converter, patterns);