[cc] cleanup: move files to cc/ir/

Author: jgarzik

cc/dce.rs cc/ir/dce.rscc/dce.rs renamed to cc/ir/dce.rs

@@ -15,7 +15,7 @@
 // 3. Delete all unmarked instructions
 //
 
-use crate::ir::{BasicBlockId, Function, Instruction, Opcode, PseudoId};
+use super::{BasicBlockId, Function, Instruction, Opcode, PseudoId};
 use std::collections::{HashSet, VecDeque};
 
 // ============================================================================

cc/dominate.rs cc/ir/dominate.rscc/dominate.rs renamed to cc/ir/dominate.rs

@@ -13,7 +13,7 @@
 // - IDF computation: "A Linear Time Algorithm for Placing phi-nodes" by Sreedhar and Gao
 //
 
-use crate::ir::{BasicBlockId, Function};
+use super::{BasicBlockId, Function};
 use std::collections::{HashMap, HashSet};
 
 // ============================================================================

cc/instcombine.rs cc/ir/instcombine.rscc/instcombine.rs renamed to cc/ir/instcombine.rs

@@ -14,7 +14,7 @@
 // - Identity patterns: x - x -> 0, x ^ x -> 0, etc.
 //
 
-use crate::ir::{Function, Instruction, Opcode, Pseudo, PseudoId, PseudoKind};
+use super::{Function, Instruction, Opcode, Pseudo, PseudoId, PseudoKind};
 use crate::types::TypeId;
 
 // ============================================================================

cc/linearize.rs cc/ir/linearize.rscc/linearize.rs renamed to cc/ir/linearize.rs

@@ -10,15 +10,15 @@
 // Converts AST to SSA-style IR following sparse's design
 //
 
-use crate::diag::Position;
-use crate::ir::{
+use super::ssa::ssa_convert;
+use super::{
     BasicBlock, BasicBlockId, Function, Initializer, Instruction, Module, Opcode, Pseudo, PseudoId,
 };
+use crate::diag::Position;
 use crate::parse::ast::{
     AssignOp, BinaryOp, BlockItem, Declaration, Designator, Expr, ExprKind, ExternalDecl, ForInit,
     FunctionDef, InitElement, Stmt, TranslationUnit, UnaryOp,
 };
-use crate::ssa::ssa_convert;
 use crate::strings::{StringId, StringTable};
 use crate::symbol::SymbolTable;
 use crate::target::Target;

cc/lower.rs cc/ir/lower.rscc/lower.rs renamed to cc/ir/lower.rs

@@ -15,7 +15,7 @@
 // - Phi elimination: Converts SSA phi nodes to copy instructions
 //
 
-use crate::ir::{BasicBlockId, Function, Instruction, Module, Opcode};
+use super::{BasicBlockId, Function, Instruction, Module, Opcode};
 use std::collections::HashMap;
 
 // ============================================================================

cc/ir.rs cc/ir/mod.rscc/ir.rs renamed to cc/ir/mod.rs

@@ -14,6 +14,13 @@
 // optimization passes.
 //
 
+pub mod dce;
+pub mod dominate;
+pub mod instcombine;
+pub mod linearize;
+pub mod lower;
+pub mod ssa;
+
 use crate::diag::Position;
 use crate::types::TypeId;
 use std::collections::HashMap;

cc/ssa.rs cc/ir/ssa.rscc/ssa.rs renamed to cc/ir/ssa.rs

@@ -14,10 +14,8 @@
 // - Renames variables to complete SSA construction
 //
 
-use crate::dominate::{compute_dominance_frontiers, domtree_build, idf_compute};
-use crate::ir::{
-    BasicBlockId, Function, InsnRef, Instruction, Opcode, Pseudo, PseudoId, PseudoKind,
-};
+use super::dominate::{compute_dominance_frontiers, domtree_build, idf_compute};
+use super::{BasicBlockId, Function, InsnRef, Instruction, Opcode, Pseudo, PseudoId, PseudoKind};
 use crate::types::{TypeId, TypeTable};
 use std::collections::{HashMap, HashSet};
 

cc/main.rs

@@ -10,17 +10,11 @@
 //
 
 mod arch;
-mod dce;
 mod diag;
-mod dominate;
-mod instcombine;
 mod ir;
-mod linearize;
-mod lower;
 mod opt;
 mod os;
 mod parse;
-mod ssa;
 mod strings;
 mod symbol;
 mod target;
@@ -218,7 +212,7 @@ fn process_file(
     }
 
     // Linearize to IR
-    let mut module = linearize::linearize_with_debug(
+    let mut module = ir::linearize::linearize_with_debug(
         &ast,
         &symbols,
         &types,
@@ -239,7 +233,7 @@ fn process_file(
     }
 
     // Lower IR (phi elimination, etc.)
-    lower::lower_module(&mut module);
+    ir::lower::lower_module(&mut module);
 
     // Generate assembly
     let emit_unwind_tables = !args.no_unwind_tables;

cc/opt.rs

@@ -12,8 +12,8 @@
 // used by optimization passes (InstCombine, DCE, etc.).
 //
 
-use crate::dce;
-use crate::instcombine;
+use crate::ir::dce;
+use crate::ir::instcombine;
 use crate::ir::{Function, Module};
 
 #[cfg(test)]