resolve PR comments

Author: ritu-thombre99

frontend/catalyst/compiler.py

@@ -374,7 +374,12 @@ def to_mlir_opt(*args, stdin=None, options: Optional[CompileOptions] = None):
 
     opts = _options_to_cli_flags(options)
     raw_result = _quantum_opt(*opts, *args, stdin=stdin)
-    regex_search_for_json = re.search(r"\{[a-zA-Z0-9_\":\{\},\n]+\}", raw_result)
+    regex_search_for_json = re.search(r"\{.*?\}", raw_result, re.DOTALL)
+
+    # No ppm_specs json is found
+    if regex_search_for_json is None:
+        return raw_result
+    
     raw_result = raw_result.replace(regex_search_for_json.group(0), "")
     return raw_result
 
@@ -388,12 +393,7 @@ def to_ppm_spec(*args, stdin=None, options: Optional[CompileOptions] = None):
     opts = _options_to_cli_flags(options)
 
     raw_json_format = _quantum_opt(*opts, *args, stdin=stdin)
-    regex_search_for_json = re.search(r"\{[a-zA-Z0-9_\":\{\},\n]+\}", raw_json_format)
-
-    # No ppm_specs json is found
-    if regex_search_for_json is None:
-        return raw_json_format
-    
+    regex_search_for_json = re.search(r"\{.*?\}", raw_json_format, re.DOTALL)
     json_ppm_specs = regex_search_for_json.group(0)
     json_ppm_specs = json_ppm_specs.replace(",\n}", "\n}")
     json_ppm_specs = json.loads(json_ppm_specs)

mlir/include/QEC/Transforms/Passes.td

@@ -124,10 +124,6 @@ def CliffordTToPPMPass : Pass<"ppm_compilation"> {
 def CountPPMSpecsPass : Pass<"ppm_specs"> {
     let summary = "Count specs in Pauli Product Measurement operations.";
 
-    let dependentDialects = [
-        "catalyst::qec::QECDialect",
-    ];
-
     let constructor = "catalyst::createCountPPMSpecsPass()";
 }
 

mlir/lib/QEC/Transforms/CMakeLists.txt

@@ -32,7 +32,27 @@ set(DEPENDS
 
 add_mlir_library(${LIBRARY_NAME} STATIC ${SRC} LINK_LIBS PRIVATE ${LIBS} DEPENDS ${DEPENDS})
 target_compile_features(${LIBRARY_NAME} PUBLIC cxx_std_20)
+
+include(FetchContent)
+FetchContent_Declare(json
+    URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
+    URL_HASH  SHA256=d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
+    DOWNLOAD_EXTRACT_TIMESTAMP true
+    SYSTEM
+)
+FetchContent_MakeAvailable(json)
+target_link_libraries(${LIBRARY_NAME} 
+    PRIVATE nlohmann_json::nlohmann_json
+)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+set_source_files_properties(
+    CountPPMSpecs.cpp
+    COMPILE_FLAGS "-Wno-covered-switch-default"
+)
+endif()
+
 target_include_directories(${LIBRARY_NAME} PUBLIC
                            .
                            ${PROJECT_SOURCE_DIR}/include
-                           ${CMAKE_BINARY_DIR}/include)
+                           ${CMAKE_BINARY_DIR}/include)

mlir/lib/QEC/Transforms/CountPPMSpecs.cpp

@@ -14,23 +14,21 @@
 
 #define DEBUG_TYPE "ppm_specs"
 
-#include "mlir/Analysis/SliceAnalysis.h"
+#include <algorithm>
+#include <string>
+
+#include <nlohmann/json.hpp>
+
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
-
 
 #include "QEC/IR/QECDialect.h"
-#include "QEC/Transforms/Patterns.h"
-#include "Quantum/IR/QuantumOps.h"
-#include "QEC/Utils/PauliStringWrapper.h"
-#include <algorithm>
-#include <string>
 
 using namespace llvm;
 using namespace mlir;
 using namespace catalyst;
 using namespace catalyst::qec;
+using json = nlohmann::json;
 
 namespace catalyst {
 namespace qec {
@@ -39,7 +37,6 @@ namespace qec {
 #define GEN_PASS_DECL_COUNTPPMSPECSPASS
 #include "QEC/Transforms/Passes.h.inc"
 
-
 struct CountPPMSpecsPass : public impl::CountPPMSpecsPassBase<CountPPMSpecsPass> {
     using CountPPMSpecsPassBase::CountPPMSpecsPassBase;
 
@@ -55,11 +52,6 @@ struct CountPPMSpecsPass : public impl::CountPPMSpecsPassBase<CountPPMSpecsPass>
             // Skip top-level container ops if desired
             if (isa<ModuleOp>(op)) return;
 
-            // TODO: Remove debug in future
-            // llvm::outs()<<"\n-----------------------------MLIR------------------------------\n";
-            // op->print(llvm::outs());
-            // llvm::outs()<<"\n-----------------------------MLIR------------------------------\n";
-
             StringRef gate_name = op->getName().getStringRef();
 
             if (gate_name == "quantum.alloc") {
@@ -69,7 +61,7 @@ struct CountPPMSpecsPass : public impl::CountPPMSpecsPassBase<CountPPMSpecsPass>
             }
 
             if (gate_name == "qec.ppm") {
-                PPM_Specs["num_of_ppm"] = PPM_Specs["num_of_ppm"] + 1;
+                PPM_Specs["num_of_ppm"]++;
             }
 
             if (gate_name == "qec.ppr") {
@@ -86,29 +78,15 @@ struct CountPPMSpecsPass : public impl::CountPPMSpecsPassBase<CountPPMSpecsPass>
                         PPM_Specs[max_weight_pi_key] = static_cast<int>(pauli_product_attr.size());
                     }
                     else {
-                        PPM_Specs[num_pi_key] = PPM_Specs[num_pi_key] + 1;
+                        PPM_Specs[num_pi_key]++;
                         PPM_Specs[max_weight_pi_key] = std::max(PPM_Specs[max_weight_pi_key], static_cast<int>(pauli_product_attr.size()));
                     }
                 }
             }
-            // TODO: Implement depth using slicing 
-            // mlir::SetVector <Operation *> backwardSlice;
-            // getBackwardSlice(op, &backwardSlice);
-            // llvm::outs()<<"\n-----------------------------SLICE-----------------------------\n";
-            // llvm::outs()<<"Backward slicing\n";
-            // for (Operation *o : backwardSlice) {
-            //     if (o->getName().getStringRef() == "quantum.extract") {
-            //         llvm::outs() << *o << "\n"; 
-            //     }
-            // }
-            // llvm::outs()<<"\n-----------------------------SLICE------------------------------\n";
         });
 
-        llvm::outs() << "{\n";
-        for (const auto &entry : PPM_Specs) {
-            llvm::outs() << '"' << entry.first << '"' << ":" << entry.second << ",\n";
-        }
-        llvm::outs() << "}\n";
+        json PPM_Specs_Json = PPM_Specs;
+        llvm::outs() << PPM_Specs_Json.dump(4) << "\n";
         return;
     }