[Mlir-commits] [mlir] 282ea28 - [mlir][nvvm] Fix circular dependency in (#68934)

[llvmlistbot at llvm.org]

Author: Guray Ozen
Date: 2023-10-12T16:24:36-07:00
New Revision: 282ea28f18cf01b350c91450be60e82fff7cbf42

URL: https://github.com/llvm/llvm-project/commit/282ea28f18cf01b350c91450be60e82fff7cbf42
DIFF: https://github.com/llvm/llvm-project/commit/282ea28f18cf01b350c91450be60e82fff7cbf42.diff

LOG: [mlir][nvvm] Fix circular dependency in (#68934)

BasicPtxBuilder includes NVVMDialect and vice versa. Cmake appereantly
forgives that, but this causes bazel build fails. This PR aims to fix
that

Added: 
    

Modified: 
    mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp b/mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp
index eeedccf3ba3fcbc..121504fc20c018f 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Dialect/LLVMIR/BasicPtxBuilderInterface.h"
-#include "mlir/Dialect/LLVMIR/NVVMDialect.h"
 #include "mlir/Support/LogicalResult.h"
 
 #define DEBUG_TYPE "ptx-builder"
@@ -28,6 +27,8 @@
 using namespace mlir;
 using namespace NVVM;
 
+static constexpr int64_t kSharedMemorySpace = 3;
+
 static char getRegisterType(Type type) {
   if (type.isInteger(1))
     return 'b';
@@ -43,7 +44,7 @@ static char getRegisterType(Type type) {
     return 'd';
   if (auto ptr = type.dyn_cast<LLVM::LLVMPointerType>()) {
     // Shared address spaces is addressed with 32-bit pointers.
-    if (ptr.getAddressSpace() == NVVM::kSharedMemorySpace) {
+    if (ptr.getAddressSpace() == kSharedMemorySpace) {
       return 'r';
     }
     return 'l';