Explicit registration of codegen dialect. (#2468)

* Explicit registration of codegen dialect. Modify the cudaq-opt tool so that it explicit registers the codegen dialect. This change enables easier experimentation and has no effect on the existing compiler flow. Signed-off-by: Eric Schweitz <[email protected]> * Update comment. Signed-off-by: Eric Schweitz <[email protected]> --------- Signed-off-by: Eric Schweitz <[email protected]>
NVIDIA · Dec 13, 2024 · fa63aa2 · fa63aa2
1 parent 912816f
commit fa63aa2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/lib/Optimizer/CodeGen/CodeGenDialect.h → .../cudaq/Optimizer/CodeGen/CodeGenDialect.h b/lib/Optimizer/CodeGen/CodeGenDialect.h → .../cudaq/Optimizer/CodeGen/CodeGenDialect.h
diff --git a/include/cudaq/Optimizer/InitAllDialects.h b/include/cudaq/Optimizer/InitAllDialects.h
@@ -33,7 +33,7 @@ inline void registerAllDialects(mlir::DialectRegistry &registry) {
     mlir::math::MathDialect,
     mlir::memref::MemRefDialect,
 
-    // NVQ++ dialects
+    // CUDA-Q dialects
     cudaq::cc::CCDialect,
     quake::QuakeDialect
   >();

diff --git a/lib/Optimizer/CodeGen/CodeGenDialect.cpp b/lib/Optimizer/CodeGen/CodeGenDialect.cpp
@@ -6,7 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
-#include "CodeGenDialect.h"
+#include "cudaq/Optimizer/CodeGen/CodeGenDialect.h"
 #include "CodeGenOps.h"
 #include "mlir/IR/DialectImplementation.h"
 

diff --git a/lib/Optimizer/CodeGen/CodeGenTypes.cpp b/lib/Optimizer/CodeGen/CodeGenTypes.cpp
@@ -7,7 +7,7 @@
  ******************************************************************************/
 
 #include "CodeGenTypes.h"
-#include "CodeGenDialect.h"
+#include "cudaq/Optimizer/CodeGen/CodeGenDialect.h"
 #include "llvm/ADT/TypeSwitch.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/DialectImplementation.h"

diff --git a/lib/Optimizer/CodeGen/ConvertCCToLLVM.cpp b/lib/Optimizer/CodeGen/ConvertCCToLLVM.cpp
@@ -6,9 +6,9 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
-#include "CodeGenDialect.h"
 #include "cudaq/Optimizer/Builder/Intrinsics.h"
 #include "cudaq/Optimizer/CodeGen/CCToLLVM.h"
+#include "cudaq/Optimizer/CodeGen/CodeGenDialect.h"
 #include "cudaq/Optimizer/CodeGen/Passes.h"
 #include "cudaq/Optimizer/Dialect/CC/CCOps.h"
 #include "cudaq/Optimizer/Dialect/CC/CCTypes.h"

diff --git a/lib/Optimizer/CodeGen/PassDetails.h b/lib/Optimizer/CodeGen/PassDetails.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "CodeGenDialect.h"
+#include "cudaq/Optimizer/CodeGen/CodeGenDialect.h"
 #include "cudaq/Optimizer/Dialect/CC/CCDialect.h"
 #include "cudaq/Optimizer/Dialect/Quake/QuakeDialect.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"

diff --git a/tools/cudaq-opt/cudaq-opt.cpp b/tools/cudaq-opt/cudaq-opt.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+#include "cudaq/Optimizer/CodeGen/CodeGenDialect.h"
 #include "cudaq/Optimizer/CodeGen/Passes.h"
 #include "cudaq/Optimizer/Dialect/CC/CCDialect.h"
 #include "cudaq/Optimizer/Dialect/Common/InlinerInterface.h"
@@ -75,6 +76,7 @@ int main(int argc, char **argv) {
 
   mlir::DialectRegistry registry;
   cudaq::registerAllDialects(registry);
+  registry.insert<cudaq::codegen::CodeGenDialect>();
   registerInlinerExtension(registry);
   return mlir::asMainReturnCode(
       mlir::MlirOptMain(argc, argv, "nvq++ optimizer\n", registry));