Fix OSS build (Linux)

--

PiperOrigin-RevId: 247472005

diff --git a/mlir/include/mlir/CMakeLists.txt b/mlir/include/mlir/CMakeLists.txt
index 21a4b21..af16f85 100644 (file)
--- a/mlir/include/mlir/CMakeLists.txt
+++ b/mlir/include/mlir/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(EDSC)
 add_subdirectory(FxpMathOps)
+add_subdirectory(GPU)
 add_subdirectory(Linalg)
 add_subdirectory(LLVMIR)
 add_subdirectory(Quantization)

diff --git a/mlir/include/mlir/GPU/CMakeLists.txt b/mlir/include/mlir/GPU/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5ba59a1
--- /dev/null
+++ b/mlir/include/mlir/GPU/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(LLVM_TARGET_DEFINITIONS GPUOps.td)
+mlir_tablegen(GPUOps.h.inc -gen-op-decls)
+mlir_tablegen(GPUOps.cpp.inc -gen-op-defs)
+add_public_tablegen_target(MLIRGPUOpsIncGen)

diff --git a/mlir/lib/GPU/CMakeLists.txt b/mlir/lib/GPU/CMakeLists.txt
index 36ed3c6..f3b62cf 100644 (file)
--- a/mlir/lib/GPU/CMakeLists.txt
+++ b/mlir/lib/GPU/CMakeLists.txt
@@ -5,5 +5,5 @@ add_llvm_library(MLIRGPU
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/GPU
 )
-add_dependencies(MLIRGPU MLIRIR LLVMSupport)
+add_dependencies(MLIRGPU MLIRGPUOpsIncGen MLIRIR LLVMSupport)
 target_link_libraries(MLIRGPU MLIRIR LLVMSupport)

diff --git a/mlir/lib/IR/AsmPrinter.cpp b/mlir/lib/IR/AsmPrinter.cpp
index 33dc0b7..4355919 100644 (file)
--- a/mlir/lib/IR/AsmPrinter.cpp
+++ b/mlir/lib/IR/AsmPrinter.cpp
@@ -79,9 +79,10 @@ static llvm::cl::opt<bool>
                        llvm::cl::init(false), llvm::cl::Hidden);
 
 namespace {
+/// A special index constant used for non-kind attribute aliases.
+static constexpr int kNonAttrKindAlias = -1;
+
 class ModuleState {
-  /// A special index constant used for non-kind attribute aliases.
-  static constexpr int kNonAttrKindAlias = -1;
 
 public:
   /// This is the current context if it is knowable, otherwise this is null.