From 1f231dca7ea5ef88fb6bf2167e9f317d06d8dd48 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 14 Apr 2020 19:34:53 +0100
Subject: [PATCH] rename multi modules

---
 src/soc/scoremulti/__init__.py                              | 0
 .../scoremulti/{dep_multi_cell.py => dependence_cell.py}    | 0
 src/soc/scoremulti/{fu_dep_cell_multi.py => fu_dep_cell.py} | 0
 .../scoremulti/{fu_fu_matrix_multi.py => fu_fu_matrix.py}   | 2 +-
 .../scoremulti/{fu_reg_matrix_multi.py => fu_reg_matrix.py} | 6 +++---
 .../scoremulti/{fu_wr_pend_multi.py => fu_wr_pending.py}    | 0
 src/soc/scoremulti/{memfu_multi.py => memfu.py}             | 2 +-
 src/soc/scoremulti/{reg_sel_multi.py => reg_sel.py}         | 0
 8 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 src/soc/scoremulti/__init__.py
 rename src/soc/scoremulti/{dep_multi_cell.py => dependence_cell.py} (100%)
 rename src/soc/scoremulti/{fu_dep_cell_multi.py => fu_dep_cell.py} (100%)
 rename src/soc/scoremulti/{fu_fu_matrix_multi.py => fu_fu_matrix.py} (98%)
 rename src/soc/scoremulti/{fu_reg_matrix_multi.py => fu_reg_matrix.py} (98%)
 rename src/soc/scoremulti/{fu_wr_pend_multi.py => fu_wr_pending.py} (100%)
 rename src/soc/scoremulti/{memfu_multi.py => memfu.py} (98%)
 rename src/soc/scoremulti/{reg_sel_multi.py => reg_sel.py} (100%)

diff --git a/src/soc/scoremulti/__init__.py b/src/soc/scoremulti/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/soc/scoremulti/dep_multi_cell.py b/src/soc/scoremulti/dependence_cell.py
similarity index 100%
rename from src/soc/scoremulti/dep_multi_cell.py
rename to src/soc/scoremulti/dependence_cell.py
diff --git a/src/soc/scoremulti/fu_dep_cell_multi.py b/src/soc/scoremulti/fu_dep_cell.py
similarity index 100%
rename from src/soc/scoremulti/fu_dep_cell_multi.py
rename to src/soc/scoremulti/fu_dep_cell.py
diff --git a/src/soc/scoremulti/fu_fu_matrix_multi.py b/src/soc/scoremulti/fu_fu_matrix.py
similarity index 98%
rename from src/soc/scoremulti/fu_fu_matrix_multi.py
rename to src/soc/scoremulti/fu_fu_matrix.py
index 6fe20484..1219848e 100644
--- a/src/soc/scoremulti/fu_fu_matrix_multi.py
+++ b/src/soc/scoremulti/fu_fu_matrix.py
@@ -2,7 +2,7 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Elaboratable, Array, Cat, Const
 
-from soc.scoremulti.fu_dep_cell_multi import FUDependenceCell
+from soc.scoremulti.fu_dep_cell import FUDependenceCell
 from soc.scoreboard.fu_picker_vec import FU_Pick_Vec
 
 """
diff --git a/src/soc/scoremulti/fu_reg_matrix_multi.py b/src/soc/scoremulti/fu_reg_matrix.py
similarity index 98%
rename from src/soc/scoremulti/fu_reg_matrix_multi.py
rename to src/soc/scoremulti/fu_reg_matrix.py
index 04b547bf..f11809c6 100644
--- a/src/soc/scoremulti/fu_reg_matrix_multi.py
+++ b/src/soc/scoremulti/fu_reg_matrix.py
@@ -2,9 +2,9 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Elaboratable, Array, Cat, Repl
 
-from soc.scoremulti.dep_multi_cell import DependencyRow
-from soc.scoremulti.fu_wr_pend_multi import FU_RW_Pend
-from soc.scoremulti.reg_sel_multi import Reg_Rsv
+from soc.scoremulti.dependence_cell import DependencyRow
+from soc.scoremulti.fu_wr_pending import FU_RW_Pend
+from soc.scoremulti.reg_sel import Reg_Rsv
 from soc.scoreboard.global_pending import GlobalPending
 
 """
diff --git a/src/soc/scoremulti/fu_wr_pend_multi.py b/src/soc/scoremulti/fu_wr_pending.py
similarity index 100%
rename from src/soc/scoremulti/fu_wr_pend_multi.py
rename to src/soc/scoremulti/fu_wr_pending.py
diff --git a/src/soc/scoremulti/memfu_multi.py b/src/soc/scoremulti/memfu.py
similarity index 98%
rename from src/soc/scoremulti/memfu_multi.py
rename to src/soc/scoremulti/memfu.py
index 0c3bc049..9e4fb84b 100644
--- a/src/soc/scoremulti/memfu_multi.py
+++ b/src/soc/scoremulti/memfu.py
@@ -2,7 +2,7 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Array, Elaboratable
 
-from soc.scoremulti.fu_fu_matrix_multi import FUFUDepMatrix
+from soc.scoremulti.fu_fu_matrix import FUFUDepMatrix
 from soc.scoreboard.mdm import FUMemMatchMatrix
 
 
diff --git a/src/soc/scoremulti/reg_sel_multi.py b/src/soc/scoremulti/reg_sel.py
similarity index 100%
rename from src/soc/scoremulti/reg_sel_multi.py
rename to src/soc/scoremulti/reg_sel.py
-- 
2.30.2