Merge pull request #191 from Qiskit/hh_disable_verifier_in_release

Change default value of `verify-each` into false in release mode

Author: hhorii

cmake/apple-clang.cmake

@@ -39,6 +39,6 @@ if(ENABLE_ADDRESS_SANITIZER OR ENABLE_UNDEFINED_SANITIZER OR ENABLE_THREAD_SANIT
 endif()
 
 set (CMAKE_CXX_FLAGS_DEBUG "-g3 -O0")
-set (CMAKE_CXX_FLAGS_RELEASE "-g -O2")
+set (CMAKE_CXX_FLAGS_RELEASE "-g -O2 -DNDEBUG")
 
 set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)

cmake/linux-gcc.cmake

@@ -40,7 +40,7 @@ if(ENABLE_THREAD_SANITIZER)
 endif()
 
 set (CMAKE_CXX_FLAGS_DEBUG "-g3 -O0")
-set (CMAKE_CXX_FLAGS_RELEASE "-g -O2")
+set (CMAKE_CXX_FLAGS_RELEASE "-g -O2 -DNDEBUG")
 
 # set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
 set (CMAKE_CXX_STANDARD_LIBRARIES "-lstdc++fs -lpthread")

cmake/llvm-clang.cmake

@@ -42,7 +42,7 @@ if(ENABLE_ADDRESS_SANITIZER OR ENABLE_UNDEFINED_SANITIZER OR ENABLE_THREAD_SANIT
 endif()
 
 set (CMAKE_CXX_FLAGS_DEBUG "-g3 -O0")
-set (CMAKE_CXX_FLAGS_RELEASE "-g -O2")
+set (CMAKE_CXX_FLAGS_RELEASE "-g -O2 -DNDEBUG")
 
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
 set (CMAKE_CXX_STANDARD_LIBRARIES "-lstdc++fs -lpthread")

lib/API/api.cpp

@@ -85,10 +85,17 @@ static llvm::cl::opt<bool> verifyDiagnostics(
                    "expected-* lines on the corresponding line"),
     llvm::cl::init(false), llvm::cl::cat(qssc::config::getQSSCCategory()));
 
+#ifndef NDEBUG
+#define VERIFY_PASSES_DEFAULT true
+#else
+#define VERIFY_PASSES_DEFAULT false
+#endif
+
 static llvm::cl::opt<bool> verifyPasses(
     "verify-each",
     llvm::cl::desc("Run the verifier after each transformation pass"),
-    llvm::cl::init(true), llvm::cl::cat(qssc::config::getQSSCCategory()));
+    llvm::cl::init(VERIFY_PASSES_DEFAULT),
+    llvm::cl::cat(qssc::config::getQSSCCategory()));
 
 static llvm::cl::opt<bool> showDialects(
     "show-dialects", llvm::cl::desc("Print the list of registered dialects"),
@@ -561,7 +568,7 @@ compile_(int argc, char const **argv, std::string *outputString,
   mlir::applyPassManagerCLOptions(pm);
   mlir::applyDefaultTimingPassManagerCLOptions(pm);
 
-  // Enable verifier (default: true)
+  // Configure verifier
   pm.enableVerifier(verifyPasses);
 
   // Build the configuration for this compilation event.