From 330838eb907f2ac4bf6ba6c8fb18280de6e430d9 Mon Sep 17 00:00:00 2001
From: River Riddle <riddleriver@gmail.com>
Date: Sun, 6 Feb 2022 15:10:03 -0800
Subject: [PATCH] [mlir] Fix GpuToLLVM conversion pass after ControlFlow
 operations were split from Standard

---
 mlir/lib/Conversion/GPUCommon/CMakeLists.txt          | 1 +
 mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt
index 339afbf5a0af..92eb95ab42e0 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 212453e8b358..a30bfaf5cce4 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);