From: Jacques Pienaar <jpienaar@google.com>
Date: Mon, 29 Apr 2019 23:12:15 +0000 (-0700)
Subject:     Fix opt build failure.
X-Git-Tag: llvmorg-11-init~1466^2~1868
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9fd19578521eabfc5b8c037d06449233f9c8c59d;p=platform%2Fupstream%2Fllvm.git

Fix opt build failure.

--

PiperOrigin-RevId: 245844236
---

diff --git a/mlir/lib/IR/MLIRContext.cpp b/mlir/lib/IR/MLIRContext.cpp
index 7b88414..cad3a28 100644
--- a/mlir/lib/IR/MLIRContext.cpp
+++ b/mlir/lib/IR/MLIRContext.cpp
@@ -909,7 +909,8 @@ SDBMStripeExpr SDBMStripeExpr::get(SDBMPositiveExpr var,
                                    SDBMConstantExpr stripeFactor) {
   assert(var && "expected SDBM variable expression");
   assert(stripeFactor && "expected non-null stripe factor");
-  assert(stripeFactor.getValue() > 0 && "non-positive stripe factor");
+  if (stripeFactor.getValue() <= 0)
+    llvm::report_fatal_error("non-positive stripe factor");
 
   MLIRContextImpl &impl = var.getContext()->getImpl();
   auto key = std::make_tuple(var, stripeFactor);
diff --git a/mlir/lib/LLVMIR/CMakeLists.txt b/mlir/lib/LLVMIR/CMakeLists.txt
index 4314543..edfdd5d 100644
--- a/mlir/lib/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/LLVMIR/CMakeLists.txt
@@ -7,3 +7,11 @@ add_llvm_library(MLIRLLVMIR
   )
 add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
 target_link_libraries(MLIRLLVMIR LLVMAsmParser LLVMCore LLVMSupport)
+add_llvm_library(MLIRNVVMIR
+  IR/NVVMDialect.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/LLVMIR
+  )
+add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
+target_link_libraries(MLIRNVVMIR LLVMAsmParser LLVMCore LLVMSupport)
diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt
index 6a27f2f..6c92f26 100644
--- a/mlir/tools/mlir-opt/CMakeLists.txt
+++ b/mlir/tools/mlir-opt/CMakeLists.txt
@@ -23,6 +23,7 @@ set(LIBS
   MLIRGPU
   MLIRLinalg
   MLIRLLVMIR
+  MLIRNVVMIR
   MLIRParser
   MLIRPass
   MLIRQuantization