From 8b5e701fe47cd0fad28986f6270dca5f27722892 Mon Sep 17 00:00:00 2001
From: Russel Arbore <russel.jma@gmail.com>
Date: Thu, 26 Sep 2024 17:53:01 -0500
Subject: [PATCH] Address warnings

---
 hercules_cg/src/cpu.rs       | 5 -----
 hercules_cg/src/sched_dot.rs | 1 -
 hercules_cg/src/sched_gen.rs | 5 -----
 hercules_opt/src/pass.rs     | 4 ----
 4 files changed, 15 deletions(-)

diff --git a/hercules_cg/src/cpu.rs b/hercules_cg/src/cpu.rs
index 898f83d3..716613ef 100644
--- a/hercules_cg/src/cpu.rs
+++ b/hercules_cg/src/cpu.rs
@@ -200,10 +200,6 @@ pub fn cpu_compile<W: Write>(
                     block.virt_regs[inst_id.idx_1()].0,
                     &block.insts[inst_idx],
                     block.kind.try_fork_join_id(),
-                    block
-                        .kind
-                        .try_fork_join_id()
-                        .map(|fork_join_id| &parallel_reduce_infos[&fork_join_id]),
                     &block_names,
                     &svalue_types,
                     w,
@@ -321,7 +317,6 @@ fn emit_inst<W: Write>(
     virt_reg: usize,
     inst: &SInst,
     location: Option<ForkJoinID>,
-    parallel_reduce_info: Option<&ParallelReduceInfo>,
     block_names: &HashMap<(BlockID, Option<ForkJoinID>), String>,
     types: &HashMap<SValue, SType>,
     w: &mut W,
diff --git a/hercules_cg/src/sched_dot.rs b/hercules_cg/src/sched_dot.rs
index e21ca9c5..9f70dcff 100644
--- a/hercules_cg/src/sched_dot.rs
+++ b/hercules_cg/src/sched_dot.rs
@@ -6,7 +6,6 @@ use std::env::temp_dir;
 use std::fmt::Write;
 use std::fs::File;
 use std::io::Write as _;
-use std::iter::zip;
 use std::process::Command;
 
 use self::bitvec::prelude::*;
diff --git a/hercules_cg/src/sched_gen.rs b/hercules_cg/src/sched_gen.rs
index 166923a6..fe08c520 100644
--- a/hercules_cg/src/sched_gen.rs
+++ b/hercules_cg/src/sched_gen.rs
@@ -16,7 +16,6 @@ use crate::*;
 pub fn sched_compile(
     module: &Module,
     def_uses: &Vec<ImmutableDefUseMap>,
-    reverse_postorders: &Vec<Vec<NodeID>>,
     typing: &ModuleTyping,
     control_subgraphs: &Vec<Subgraph>,
     fork_join_maps: &Vec<HashMap<NodeID, NodeID>>,
@@ -39,7 +38,6 @@ pub fn sched_compile(
             &module.constants,
             &module.dynamic_constants,
             &def_uses[idx],
-            &reverse_postorders[idx],
             &typing[idx],
             &control_subgraphs[idx],
             &fork_join_maps[idx],
@@ -183,7 +181,6 @@ struct FunctionContext<'a> {
     constants: &'a Vec<Constant>,
     dynamic_constants: &'a Vec<DynamicConstant>,
     def_use: &'a ImmutableDefUseMap,
-    reverse_postorder: &'a Vec<NodeID>,
     typing: &'a Vec<TypeID>,
     control_subgraph: &'a Subgraph,
     fork_join_map: &'a HashMap<NodeID, NodeID>,
@@ -210,7 +207,6 @@ impl<'a> FunctionContext<'a> {
         constants: &'a Vec<Constant>,
         dynamic_constants: &'a Vec<DynamicConstant>,
         def_use: &'a ImmutableDefUseMap,
-        reverse_postorder: &'a Vec<NodeID>,
         typing: &'a Vec<TypeID>,
         control_subgraph: &'a Subgraph,
         fork_join_map: &'a HashMap<NodeID, NodeID>,
@@ -235,7 +231,6 @@ impl<'a> FunctionContext<'a> {
             constants,
             dynamic_constants,
             def_use,
-            reverse_postorder,
             typing,
             control_subgraph,
             fork_join_map,
diff --git a/hercules_opt/src/pass.rs b/hercules_opt/src/pass.rs
index 188d428d..92b24279 100644
--- a/hercules_opt/src/pass.rs
+++ b/hercules_opt/src/pass.rs
@@ -448,7 +448,6 @@ impl PassManager {
                 }
                 Pass::SchedXdot => {
                     self.make_def_uses();
-                    self.make_reverse_postorders();
                     self.make_typing();
                     self.make_control_subgraphs();
                     self.make_fork_join_maps();
@@ -460,7 +459,6 @@ impl PassManager {
                     let smodule = sched_compile(
                         &self.module,
                         self.def_uses.as_ref().unwrap(),
-                        self.reverse_postorders.as_ref().unwrap(),
                         self.typing.as_ref().unwrap(),
                         self.control_subgraphs.as_ref().unwrap(),
                         self.fork_join_maps.as_ref().unwrap(),
@@ -477,7 +475,6 @@ impl PassManager {
                 }
                 Pass::Codegen(output_file_name) => {
                     self.make_def_uses();
-                    self.make_reverse_postorders();
                     self.make_typing();
                     self.make_control_subgraphs();
                     self.make_fork_join_maps();
@@ -489,7 +486,6 @@ impl PassManager {
                     let smodule = sched_compile(
                         &self.module,
                         self.def_uses.as_ref().unwrap(),
-                        self.reverse_postorders.as_ref().unwrap(),
                         self.typing.as_ref().unwrap(),
                         self.control_subgraphs.as_ref().unwrap(),
                         self.fork_join_maps.as_ref().unwrap(),
-- 
GitLab