Graph optimizations analysis info

.gitignore

@@ -3,4 +3,6 @@
 /target
 /test_proxy
 /generators
-/.direnv
+/.direnv
+/Config.toml
+/world

crates/redpiler/ril_tests/opt/constant_fold2.ril

@@ -0,0 +1,45 @@
+test_args "--passes=constant-fold-2"
+
+circuit @simple_input {
+  %constant = constant 1
+  %repeater1 = repeater 1, false, false, true, [%constant:0], []
+  %repeater2 = repeater 1, false, false, true, [%repeater1:0], []
+  %lamp = lamp true, [%repeater2:0]
+}
+
+test(@simple_input) circuit @simple {
+  %lamp = lamp true, [%GLOBAL_CONSTANT15:0]
+  %GLOBAL_CONSTANT15 = constant 15
+}
+
+circuit @comparator_input {
+  %constant5 = constant 5
+  %constant4 = constant 4
+  %constant10 = constant 10
+  # 5 - 4
+  %comp_sub1 = comparator subtract, none, false, 1, [%constant5:0], [%constant4:0]
+  # 4 - 5
+  %comp_sub2 = comparator subtract, none, false, 1, [%constant4:0], [%constant5:0]
+  # (10 - 1) - (10 - 5)
+  %comp_sub3 = comparator subtract, none, false, 1, [%constant10:1], [%constant10:5]
+}
+
+test(@comparator_input) circuit @comparator {
+  %comp_sub2 = comparator subtract, none, false, 1, [%GLOBAL_CONSTANT15:11], [%GLOBAL_CONSTANT15:10]
+  %comp_sub3 = comparator subtract, none, false, 1, [%GLOBAL_CONSTANT15:6], [%GLOBAL_CONSTANT15:10]
+  %GLOBAL_CONSTANT15 = constant 15
+}
+
+circuit @locking_rep_input {
+  %constant = constant 1
+  %lever = lever false
+  %side_rep = repeater 1, true, false, false, [%lever:0], []
+  # This repeater should be untouched
+  %locking_rep = repeater 1, false, false, true, [%constant:0], [%side_rep:0]
+}
+
+test(@locking_rep_input) circuit @locking_rep {
+  %lever = lever false
+  %side_rep = repeater 1, true, false, false, [%lever:0], []
+  %GLOBAL_CONSTANT15 = constant 15
+}

crates/redpiler/src/backend/direct/mod.rs

@@ -346,7 +346,11 @@ fn get_all_input(node: &Node) -> (u8, u8) {
 
 // This function is optimized for input values from 0 to 15 and does not work correctly outside that
 // range
-fn calculate_comparator_output(mode: ComparatorMode, input_strength: u8, power_on_sides: u8) -> u8 {
+pub fn calculate_comparator_output(
+    mode: ComparatorMode,
+    input_strength: u8,
+    power_on_sides: u8,
+) -> u8 {
     let difference = input_strength.wrapping_sub(power_on_sides);
     if difference <= 15 {
         match mode {

crates/redpiler/src/compile_graph.rs

@@ -1,5 +1,6 @@
 use mchprs_blocks::blocks::{ComparatorMode, Instrument};
 use mchprs_blocks::BlockPos;
+use mchprs_world::{TickEntry, TickPriority};
 use petgraph::stable_graph::{NodeIndex, StableGraph};
 use smallvec::SmallVec;
 
@@ -46,11 +47,18 @@ impl NodeType {
     }
 }
 
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
+impl NodeType {
+    pub fn is_bool(&self) -> bool {
+        !matches!(self, NodeType::Wire | NodeType::Comparator { .. })
+    }
+}
+
+#[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
 pub struct NodeState {
     pub powered: bool,
     pub repeater_locked: bool,
     pub output_strength: u8,
+    pending_ticks: Option<(TickPriority, u32)>,
 }
 
 impl NodeState {
@@ -67,6 +75,7 @@ impl NodeState {
             powered,
             repeater_locked: locked,
             output_strength: if powered { 15 } else { 0 },
+            ..Default::default()
         }
     }
 
@@ -86,10 +95,10 @@ impl NodeState {
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct Annotations {}
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct CompileNode {
     pub ty: NodeType,
     pub block: SmallVec<[(BlockPos, u32); 1]>,
@@ -105,6 +114,15 @@ impl CompileNode {
     pub fn is_removable(&self) -> bool {
         !self.is_input && !self.is_output
     }
+
+    pub fn add_pending_tick(&mut self, tick: &TickEntry) {
+        assert!(!self.has_pending_ticks());
+        self.state.pending_ticks = Some((tick.tick_priority, tick.ticks_left));
+    }
+
+    pub fn has_pending_ticks(&self) -> bool {
+        self.state.pending_ticks.is_some()
+    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

crates/redpiler/src/lib.rs

@@ -147,7 +147,11 @@ impl Compiler {
         debug!("Starting compile");
         let start = Instant::now();
 
-        let input = CompilerInput { world, bounds };
+        let input = CompilerInput {
+            world,
+            bounds,
+            pending_ticks: &ticks,
+        };
         let registry = PassRegistry::default();
         let pass_pipeline = passes::build_pass_pipeline::<W>(&registry, &options);
         let graph =
@@ -256,6 +260,7 @@ impl Compiler {
 pub struct CompilerInput<'w, W: World> {
     pub world: &'w W,
     pub bounds: (BlockPos, BlockPos),
+    pub pending_ticks: &'w [TickEntry],
 }
 
 #[cfg(test)]