Add IRPrintConfig to the the enable_ir_print function.

Not yet used, but will determine how the Pass print is created.

Signed-off-by: Tomas Fabrizio Orsi <[email protected]>

Author: lima-limon-inc

hir/src/pass.rs

@@ -10,7 +10,7 @@ pub mod statistics;
 pub use self::{
     analysis::{Analysis, AnalysisManager, OperationAnalysis, PreservedAnalyses},
     instrumentation::{PassInstrumentation, PassInstrumentor, PipelineParentInfo},
-    manager::{Nesting, OpPassManager, PassDisplayMode, PassManager},
+    manager::{IRPrintingConfig, Nesting, OpPassManager, PassDisplayMode, PassManager},
     pass::{OperationPass, Pass, PassExecutionState},
     registry::{PassInfo, PassPipelineInfo},
     specialization::PassTarget,

hir/src/pass/manager.rs

@@ -1,7 +1,14 @@
-use alloc::{boxed::Box, collections::BTreeMap, format, rc::Rc, string::ToString};
+use alloc::{
+    boxed::Box,
+    collections::BTreeMap,
+    format,
+    rc::Rc,
+    string::{String, ToString},
+    vec::Vec,
+};
 
 use compact_str::{CompactString, ToCompactString};
-use midenc_session::diagnostics::Severity;
+use midenc_session::{diagnostics::Severity, Options};
 use smallvec::{smallvec, SmallVec};
 
 use super::{
@@ -29,13 +36,27 @@ pub enum PassDisplayMode {
 
 // TODO(pauls)
 #[allow(unused)]
+#[derive(Default)]
 pub struct IRPrintingConfig {
     print_module_scope: bool,
     print_after_only_on_change: bool,
     print_after_only_on_failure: bool,
+    // NOTE: Taken from the Options struct
+    print_ir_after_all: bool,
+    print_ir_after_pass: Vec<String>,
     flags: OpPrintingFlags,
 }
 
+impl From<&Options> for IRPrintingConfig {
+    fn from(options: &Options) -> Self {
+        let mut irprintconfig = IRPrintingConfig::default();
+        irprintconfig.print_ir_after_all = options.print_ir_after_all;
+        irprintconfig.print_ir_after_pass = options.print_ir_after_pass.clone();
+
+        irprintconfig
+    }
+}
+
 /// The main pass manager and pipeline builder
 pub struct PassManager {
     context: Rc<Context>,
@@ -73,6 +94,7 @@ impl PassManager {
     ///
     /// The created pass manager can schedule operations that match type `T`.
     pub fn on<T: OpRegistration>(context: Rc<Context>, nesting: Nesting) -> Self {
+        // let a = context.session().options;
         Self::new(context, <T as OpRegistration>::full_name(), nesting)
     }
 
@@ -169,12 +191,9 @@ impl PassManager {
         self
     }
 
-    // pub fn enable_ir_printing(&mut self, _config: IRPrintingConfig) {
-    pub fn enable_ir_printing(&mut self) {
-        // self.add_instrumentation(pi)
+    pub fn enable_ir_printing(&mut self, _config: IRPrintingConfig) {
         let p = Box::new(Print::any());
         self.add_instrumentation(p);
-        // todo!()
     }
 
     pub fn enable_timing(&mut self, yes: bool) -> &mut Self {

midenc-compile/src/compiler.rs

@@ -503,8 +503,10 @@ impl Compiler {
         options.no_link = codegen.no_link;
         options.print_cfg_after_all = unstable.print_cfg_after_all;
         options.print_cfg_after_pass = unstable.print_cfg_after_pass;
-        options.print_ir_after_all = unstable.print_ir_after_all;
+        // options.print_ir_after_all = unstable.print_ir_after_all;
+        options.print_ir_after_all = true;
         options.print_ir_after_pass = unstable.print_ir_after_pass;
+        std::dbg!(&options);
 
         // Establish --target-dir
         let target_dir = if self.target_dir.is_absolute() {

midenc-compile/src/stages/rewrite.rs

@@ -3,7 +3,7 @@ use alloc::boxed::Box;
 use midenc_dialect_hir::transforms::TransformSpills;
 use midenc_dialect_scf::transforms::LiftControlFlowToSCF;
 use midenc_hir::{
-    pass::{Nesting, PassManager},
+    pass::{IRPrintingConfig, Nesting, PassManager},
     patterns::{GreedyRewriteConfig, RegionSimplificationLevel},
     Op,
 };
@@ -22,6 +22,7 @@ impl Stage for ApplyRewritesStage {
     }
 
     fn run(&mut self, input: Self::Input, context: Rc<Context>) -> CompilerResult<Self::Output> {
+        let ir_print_config: IRPrintingConfig = (&context.as_ref().session().options).into();
         log::debug!(target: "driver", "applying rewrite passes");
         // TODO(pauls): Set up pass registration for new pass infra
         /*
@@ -49,7 +50,7 @@ impl Stage for ApplyRewritesStage {
 
         // Construct a pass manager with the default pass pipeline
         let mut pm = PassManager::on::<builtin::World>(context.clone(), Nesting::Implicit);
-        pm.enable_ir_printing();
+        pm.enable_ir_printing(ir_print_config);
 
         let mut rewrite_config = GreedyRewriteConfig::default();
         rewrite_config.with_region_simplification_level(RegionSimplificationLevel::Normal);