sort imports on scoreboard

diff --git a/src/soc/experiment/score6600.py b/src/soc/experiment/score6600.py
index 209bc99c28e8dae05a8e4003c697aac9fbb385a1..ee4a4cd51820bcc7a726c9a697d6d24187602d5f 100644 (file)
--- a/src/soc/experiment/score6600.py
+++ b/src/soc/experiment/score6600.py
@@ -3,15 +3,15 @@ from nmigen.cli import verilog, rtlil
 from nmigen.hdl.ast import unsigned
 from nmigen import Module, Const, Signal, Array, Cat, Elaboratable, Memory
 
-from regfile.regfile import RegFileArray, treereduce
-from scoreboard.fu_fu_matrix import FUFUDepMatrix
-from scoreboard.fu_reg_matrix import FURegDepMatrix
-from scoreboard.global_pending import GlobalPending
-from scoreboard.group_picker import GroupPicker
-from scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
-from scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
-from scoreboard.instruction_q import Instruction, InstructionQ
-from scoreboard.memfu import MemFunctionUnits
+from soc.regfile.regfile import RegFileArray, treereduce
+from soc.scoreboard.fu_fu_matrix import FUFUDepMatrix
+from soc.scoreboard.fu_reg_matrix import FURegDepMatrix
+from soc.scoreboard.global_pending import GlobalPending
+from soc.scoreboard.group_picker import GroupPicker
+from soc.scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
+from soc.scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
+from soc.scoreboard.instruction_q import Instruction, InstructionQ
+from soc.scoreboard.memfu import MemFunctionUnits
 
 from compalu import ComputationUnitNoDelay
 from compldst import LDSTCompUnit

diff --git a/src/soc/scoreboard/fn_unit.py b/src/soc/scoreboard/fn_unit.py
index 63beb70b3aa021cf818878391e7a056c668d9f4a..614a0e6d972f29e22e98f2ed7aabdce883566c8f 100644 (file)
--- a/src/soc/scoreboard/fn_unit.py
+++ b/src/soc/scoreboard/fn_unit.py
@@ -5,7 +5,7 @@ from nmigen.lib.coding import Decoder
 
 from nmutil.latch import SRLatch, latchregister
 
-from scoreboard.shadow import Shadow
+from soc.scoreboard.shadow import Shadow
 
 
 class FnUnit(Elaboratable):

diff --git a/src/soc/scoreboard/fu_mem_matrix.py b/src/soc/scoreboard/fu_mem_matrix.py
index baaa02bed61fb2b90b5e9701b61cd0616192df37..47d6bcc217999af813e0186fc2fe6ca405599474 100644 (file)
--- a/src/soc/scoreboard/fu_mem_matrix.py
+++ b/src/soc/scoreboard/fu_mem_matrix.py
@@ -2,8 +2,8 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Elaboratable, Array, Cat, Const
 
-from scoreboard.fumem_dep_cell import FUMemDependenceCell
-from scoreboard.fu_mem_picker_vec import FUMem_Pick_Vec
+from soc.scoreboard.fumem_dep_cell import FUMemDependenceCell
+from soc.scoreboard.fu_mem_picker_vec import FUMem_Pick_Vec
 
 """
 

diff --git a/src/soc/scoreboard/fu_reg_matrix.py b/src/soc/scoreboard/fu_reg_matrix.py
index 8ca1494edc3550d3b54b8f65371837f47fae7813..06380434c8d7d20828d80c3d0e020161bcb2c2e4 100644 (file)
--- a/src/soc/scoreboard/fu_reg_matrix.py
+++ b/src/soc/scoreboard/fu_reg_matrix.py
@@ -2,10 +2,10 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Elaboratable, Array, Cat, Repl
 
-from scoreboard.dependence_cell import DependencyRow
-from scoreboard.fu_wr_pending import FU_RW_Pend
-from scoreboard.reg_select import Reg_Rsv
-from scoreboard.global_pending import GlobalPending
+from soc.scoreboard.dependence_cell import DependencyRow
+from soc.scoreboard.fu_wr_pending import FU_RW_Pend
+from soc.scoreboard.reg_select import Reg_Rsv
+from soc.scoreboard.global_pending import GlobalPending
 
 """
 

diff --git a/src/soc/scoreboard/issue_unit.py b/src/soc/scoreboard/issue_unit.py
index 3ec2a31ced3dfa11510ec811602ad49fff325bf3..7718d84f95cf0a0d0898279701e09b92b41427a1 100644 (file)
--- a/src/soc/scoreboard/issue_unit.py
+++ b/src/soc/scoreboard/issue_unit.py
@@ -3,7 +3,7 @@ from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Cat, Array, Const, Repl, Elaboratable
 from nmigen.lib.coding import Decoder
 
-from scoreboard.group_picker import PriorityPicker
+from soc.scoreboard.group_picker import PriorityPicker
 
 
 class RegDecode(Elaboratable):

diff --git a/src/soc/scoreboard/mdm.py b/src/soc/scoreboard/mdm.py
index 184931ef5e2147a19b635e471b0ab5bd3851a038..aa79980fef5ddc7874f3a20e7c1878be65c1e252 100644 (file)
--- a/src/soc/scoreboard/mdm.py
+++ b/src/soc/scoreboard/mdm.py
@@ -2,8 +2,8 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module
 
-from scoreboard.fu_reg_matrix import FURegDepMatrix
-from scoreboard.addr_match import PartialAddrMatch
+from soc.scoreboard.fu_reg_matrix import FURegDepMatrix
+from soc.scoreboard.addr_match import PartialAddrMatch
 
 class FUMemMatchMatrix(FURegDepMatrix, PartialAddrMatch):
     """ implement a FU-Regs overload with memory-address matching

diff --git a/src/soc/scoreboard/mem_fu_matrix.py b/src/soc/scoreboard/mem_fu_matrix.py
index 985959963d9e2906e774c5b1b0981503d845891e..6b9ce140312290a26babe2e3e3d821ae3036e3ab 100644 (file)
--- a/src/soc/scoreboard/mem_fu_matrix.py
+++ b/src/soc/scoreboard/mem_fu_matrix.py
@@ -2,10 +2,10 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Elaboratable, Array, Cat
 
-from scoreboard.mem_dependence_cell import MemDepRow
-from scoreboard.mem_fu_pending import MemFU_Pend
-from scoreboard.mem_select import Mem_Rsv
-from scoreboard.global_pending import GlobalPending
+from soc.scoreboard.mem_dependence_cell import MemDepRow
+from soc.scoreboard.mem_fu_pending import MemFU_Pend
+from soc.scoreboard.mem_select import Mem_Rsv
+from soc.scoreboard.global_pending import GlobalPending
 
 """
 

diff --git a/src/soc/scoreboard/memfu.py b/src/soc/scoreboard/memfu.py
index 857d96c91bf18d02a5294200a9e45d3391aa64c1..2989c8e0e3913ab7c6447ed548a7272af9cb722c 100644 (file)
--- a/src/soc/scoreboard/memfu.py
+++ b/src/soc/scoreboard/memfu.py
@@ -2,8 +2,8 @@ from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Array, Elaboratable
 
-from scoreboard.fu_fu_matrix import FUFUDepMatrix
-from scoreboard.mdm import FUMemMatchMatrix
+from soc.scoreboard.fu_fu_matrix import FUFUDepMatrix
+from soc.scoreboard.mdm import FUMemMatchMatrix
 
 
 class MemFunctionUnits(Elaboratable):

diff --git a/src/soc/scoreboard/shadow.py b/src/soc/scoreboard/shadow.py
index 12f20893b5accb78ac69a8c64aff8b97eb47f05c..d99d37a8d2026e6cd9480f408d000c9f85b8bb58 100644 (file)
--- a/src/soc/scoreboard/shadow.py
+++ b/src/soc/scoreboard/shadow.py
@@ -3,7 +3,7 @@ from nmigen.cli import verilog, rtlil
 from nmigen import Module, Signal, Cat, Array, Const, Elaboratable, Repl
 from nmigen.lib.coding import Decoder
 
-from scoreboard.shadow_fn import ShadowFn
+from soc.scoreboard.shadow_fn import ShadowFn
 
 
 class ShadowMatrix(Elaboratable):

diff --git a/src/soc/scoreboard/test_iq.py b/src/soc/scoreboard/test_iq.py
index 94ceac7ec4c873e144092fd1d6eb3ed46922058c..b90c0214e799169fe1cca3e8d953affe3757fd25 100644 (file)
--- a/src/soc/scoreboard/test_iq.py
+++ b/src/soc/scoreboard/test_iq.py
@@ -6,7 +6,7 @@ from random import randint
 from nmigen.compat.sim import run_simulation
 from nmigen.cli import verilog, rtlil
 
-from scoreboard.instruction_q import InstructionQ
+from soc.scoreboard.instruction_q import InstructionQ
 from nmutil.nmoperator import eq
 
 

diff --git a/src/soc/scoreboard/test_mem2_fu_matrix.py b/src/soc/scoreboard/test_mem2_fu_matrix.py
index 0b0150eaaacf00f482d76bbb3d0e0d40902ae128..ed52394cdd9bc753a681443e5ddedf613eada34b 100644 (file)
--- a/src/soc/scoreboard/test_mem2_fu_matrix.py
+++ b/src/soc/scoreboard/test_mem2_fu_matrix.py
@@ -3,11 +3,11 @@ from nmigen.cli import verilog, rtlil
 from nmigen import Module, Const, Signal, Array, Cat, Elaboratable
 
 from regfile.regfile import RegFileArray, treereduce
-from scoreboard.global_pending import GlobalPending
-from scoreboard.group_picker import GroupPicker
-from scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
-from scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
-from scoreboard.memfu import MemFunctionUnits
+from soc.scoreboard.global_pending import GlobalPending
+from soc.scoreboard.group_picker import GroupPicker
+from soc.scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
+from soc.scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
+from soc.scoreboard.memfu import MemFunctionUnits
 from nmutil.latch import SRLatch
 from nmutil.nmoperator import eq
 

diff --git a/src/soc/scoreboard/test_mem_fu_matrix.py b/src/soc/scoreboard/test_mem_fu_matrix.py
index 9d2a7c6b1040b6185d34a04dc7b662aa5371e505..fbae0086b67304c0b339463b98f8362d8b8a54d1 100644 (file)
--- a/src/soc/scoreboard/test_mem_fu_matrix.py
+++ b/src/soc/scoreboard/test_mem_fu_matrix.py
@@ -3,12 +3,12 @@ from nmigen.cli import verilog, rtlil
 from nmigen import Module, Const, Signal, Array, Cat, Elaboratable
 
 from regfile.regfile import RegFileArray, treereduce
-from scoreboard.ldst_matrix import LDSTDepMatrix
-from scoreboard.fu_mem_matrix import FUMemDepMatrix
-from scoreboard.global_pending import GlobalPending
-from scoreboard.group_picker import GroupPicker
-from scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
-from scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
+from soc.scoreboard.ldst_matrix import LDSTDepMatrix
+from soc.scoreboard.fu_mem_matrix import FUMemDepMatrix
+from soc.scoreboard.global_pending import GlobalPending
+from soc.scoreboard.group_picker import GroupPicker
+from soc.scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
+from soc.scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
 
 from nmutil.latch import SRLatch
 from nmutil.nmoperator import eq