Merge branch 'main' into qibo_backend

Author: khalatepradnya

include/cudaq/Optimizer/CodeGen/Passes.h

@@ -35,17 +35,10 @@ namespace cudaq::opt {
 /// \deprecated Replaced by the convert to QIR API pipeline.
 void addQIRProfilePipeline(mlir::OpPassManager &pm, llvm::StringRef convertTo);
 
-void addQIRProfileVerify(mlir::OpPassManager &pm, llvm::StringRef convertTo);
-
 void addLowerToCCPipeline(mlir::OpPassManager &pm);
 void addWiresetToProfileQIRPipeline(mlir::OpPassManager &pm,
                                     llvm::StringRef profile);
 
-/// Verify that all `CallOp` targets are QIR- or NVQIR-defined functions or in
-/// the provided allowed list.
-std::unique_ptr<mlir::Pass>
-createVerifyNVQIRCallOpsPass(const std::vector<llvm::StringRef> &allowedFuncs);
-
 // Use the addQIRProfilePipeline() for the following passes.
 std::unique_ptr<mlir::Pass>
 createQIRToQIRProfilePass(llvm::StringRef convertTo);

include/cudaq/Optimizer/CodeGen/Passes.td

@@ -156,38 +156,6 @@ def RemoveMeasurements : Pass<"remove-measurements"> {
   }];
 }
 
-def VerifyNVQIRCallOps :
-    Pass<"verify-nvqir-call-ops", "mlir::LLVM::LLVMFuncOp"> {
-  let summary =
-    "Verify that all LLVM CallOps' callees are NVQIR compliant";
-  let description = [{
-    This is a function pass to verify that all function calls within the
-    function body are referring to pre-defined allowed functions or QIR
-    functions, i.e., starting with a __quantum prefix, or NVQIR runtime
-    functions.
-  }];
-  
-  let options = [
-    ListOption<"allowedFuncs", "allowed-funcs", "llvm::StringRef",
-        "Allowed list of functions in addition to NVQIR-defined function.">
-  ];
-
-  let constructor = "cudaq::opt::createVerifyNVQIRCallOpsPass({})";
-}
-
-def VerifyQIRProfile : Pass<"verify-qir-profile", "mlir::LLVM::LLVMFuncOp"> {
-  let summary = "Verify that the output conforms to the specific profile";
-  let description = [{
-    This pass scans over functions in the LLVM-IR dialect to make sure they
-    conform to the QIR specific profile.
-  }];
-
-  let options = [
-    Option<"convertTo", "convert-to", "std::string", "\"qir-base\"",
-           "Which QIR profile to convert to (default is 'qir-base')">
-  ];
-}
-
 def WireSetToProfileQIR : Pass<"wireset-to-profile-qir", "mlir::func::FuncOp"> {
   let summary = "Convert quake using wire sets to a profile of QIR";
   let description = [{

include/cudaq/Optimizer/CodeGen/QIROpaqueStructTypes.h

@@ -11,6 +11,7 @@
 /// This file provides the opaque struct types to be used with the obsolete LLVM
 /// typed pointer type.
 
+#include "cudaq/Optimizer/Dialect/CC/CCTypes.h"
 #include "mlir/Conversion/LLVMCommon/TypeConverter.h"
 #include "mlir/Dialect/LLVMIR/LLVMTypes.h"
 

include/cudaq/Verifier/NVQIRCalls.h

@@ -0,0 +1,21 @@
+/****************************************************************-*- C++ -*-****
+ * Copyright (c) 2026 NVIDIA Corporation & Affiliates.                         *
+ * All rights reserved.                                                        *
+ *                                                                             *
+ * This source code and the accompanying materials are made available under    *
+ * the terms of the Apache License 2.0 which accompanies this distribution.    *
+ ******************************************************************************/
+
+#pragma once
+
+#include "mlir/IR/BuiltinOps.h"
+#include "mlir/Support/LogicalResult.h"
+
+namespace cudaq::verifier {
+
+/**
+   Verify that the MLIR module only calls functions that are within the set of
+   valid targets for NVQIR.
+ */
+mlir::LogicalResult checkNvqirCalls(mlir::ModuleOp module);
+} // namespace cudaq::verifier

include/cudaq/Verifier/QIRLLVMIRDialect.h

@@ -0,0 +1,19 @@
+/****************************************************************-*- C++ -*-****
+ * Copyright (c) 2026 NVIDIA Corporation & Affiliates.                         *
+ * All rights reserved.                                                        *
+ *                                                                             *
+ * This source code and the accompanying materials are made available under    *
+ * the terms of the Apache License 2.0 which accompanies this distribution.    *
+ ******************************************************************************/
+
+#pragma once
+
+#include "mlir/IR/BuiltinOps.h"
+#include "mlir/Support/LogicalResult.h"
+
+namespace cudaq::verifier {
+
+/// Verify some QIR constraints when the IR is lowered to LLVM-IR dialect.
+mlir::LogicalResult checkQIRLLVMIRDialect(mlir::ModuleOp module,
+                                          mlir::StringRef profile);
+} // namespace cudaq::verifier

include/cudaq/Verifier/QIRSpec.h

@@ -0,0 +1,31 @@
+/****************************************************************-*- C++ -*-****
+ * Copyright (c) 2026 NVIDIA Corporation & Affiliates.                         *
+ * All rights reserved.                                                        *
+ *                                                                             *
+ * This source code and the accompanying materials are made available under    *
+ * the terms of the Apache License 2.0 which accompanies this distribution.    *
+ ******************************************************************************/
+
+#pragma once
+
+#include "mlir/IR/BuiltinOps.h"
+#include "mlir/Support/LogicalResult.h"
+
+namespace llvm {
+class Module;
+}
+
+namespace cudaq::verifier {
+
+struct LLVMVerifierOptions {
+  bool isBaseProfile : 1;
+  bool isAdaptiveProfile : 1;
+  bool allowAllInstructions : 1;
+  bool integerComputations : 1;
+  bool floatComputations : 1;
+};
+
+/// Verify that only LLVM instructions allowed by the QIR specification.
+mlir::LogicalResult verifyLLVMInstructions(llvm::Module *llvmModule,
+                                           LLVMVerifierOptions options);
+} // namespace cudaq::verifier

lib/CMakeLists.txt

@@ -12,3 +12,4 @@ if (NOT CUDAQ_DISABLE_CPP_FRONTEND)
 endif()
 add_subdirectory(Optimizer)
 add_subdirectory(Support)
+add_subdirectory(Verifier)

lib/Optimizer/CodeGen/CMakeLists.txt

@@ -31,8 +31,6 @@ add_cudaq_library(OptCodeGen
   ReturnToOutputLog.cpp
   TranslateToIQMJson.cpp
   TranslateToOpenQASM.cpp
-  VerifyNVQIRCalls.cpp
-  VerifyQIRProfile.cpp
   WireSetsToProfileQIR.cpp
 
   DEPENDS
@@ -43,6 +41,7 @@ add_cudaq_library(OptCodeGen
     OptCodeGenPassIncGen
     OptTransformsPassIncGen
     QuakeDialect
+    cudaq-qir-verifier
 
   LINK_LIBS PUBLIC
     CCDialect

lib/Optimizer/CodeGen/ConvertToQIRProfile.cpp

@@ -594,17 +594,10 @@ std::unique_ptr<Pass> cudaq::opt::createQIRProfilePreparationPass() {
 //===----------------------------------------------------------------------===//
 // The various passes defined here should be added as a pass pipeline.
 
-void cudaq::opt::addQIRProfileVerify(OpPassManager &pm,
-                                     llvm::StringRef convertTo) {
-  VerifyQIRProfileOptions vqpo = {convertTo.str()};
-  pm.addNestedPass<LLVM::LLVMFuncOp>(createVerifyQIRProfile(vqpo));
-}
-
 void cudaq::opt::addQIRProfilePipeline(OpPassManager &pm,
                                        llvm::StringRef convertTo) {
   assert(convertTo == "qir-adaptive" || convertTo == "qir-base");
   pm.addPass(createQIRProfilePreparationPass());
   pm.addNestedPass<LLVM::LLVMFuncOp>(createConvertToQIRFuncPass(convertTo));
   pm.addPass(createQIRToQIRProfilePass(convertTo));
-  addQIRProfileVerify(pm, convertTo);
 }

lib/Optimizer/CodeGen/Pipelines.cpp

@@ -22,10 +22,6 @@ struct TargetCodegenPipelineOptions
       *this, "loops-may-have-break",
       llvm::cl::desc("Enable break statements in loops."),
       llvm::cl::init(true)};
-  PassOptions::Option<bool> appendDeprecatedVerifier{
-      *this, "append-verifier",
-      llvm::cl::desc("Append the QIR verifier pipeline."),
-      llvm::cl::init(false)};
   PassOptions::Option<std::string> target{
       *this, "convert-to", llvm::cl::desc("Conversion target specifier."),
       llvm::cl::init("")};
@@ -107,17 +103,13 @@ void createTargetCodegenPipeline(PassManager &pm,
   pm.addPass(createConvertMathToFuncs());
   pm.addPass(createSymbolDCEPass());
   pm.addPass(cudaq::opt::createCCToLLVM());
-  if (options.appendDeprecatedVerifier)
-    cudaq::opt::addQIRProfileVerify(pm, options.target);
 }
 
 template <bool isJIT>
 void createTargetCodegenPipeline(PassManager &pm, StringRef convertTo) {
   auto convertFields = convertTo.split(':');
   TargetCodegenPipelineOptions opts;
   opts.allowBreaksInLoops = convertFields.first == "qir-adaptive";
-  opts.appendDeprecatedVerifier =
-      convertFields.first != "qir" && convertFields.first != "qir-full";
   opts.target = convertTo.str();
   createTargetCodegenPipeline<isJIT>(pm, opts);
 }