From 3e2cf461bae568b4ccf707024c80a3b8a20c5add Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 9 Mar 2020 13:52:28 +0000 Subject: [PATCH] sort imports on scoreboard --- src/soc/experiment/score6600.py | 18 +++++++++--------- src/soc/scoreboard/fn_unit.py | 2 +- src/soc/scoreboard/fu_mem_matrix.py | 4 ++-- src/soc/scoreboard/fu_reg_matrix.py | 8 ++++---- src/soc/scoreboard/issue_unit.py | 2 +- src/soc/scoreboard/mdm.py | 4 ++-- src/soc/scoreboard/mem_fu_matrix.py | 8 ++++---- src/soc/scoreboard/memfu.py | 4 ++-- src/soc/scoreboard/shadow.py | 2 +- src/soc/scoreboard/test_iq.py | 2 +- src/soc/scoreboard/test_mem2_fu_matrix.py | 10 +++++----- src/soc/scoreboard/test_mem_fu_matrix.py | 12 ++++++------ 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/soc/experiment/score6600.py b/src/soc/experiment/score6600.py index 209bc99c..ee4a4cd5 100644 --- 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 63beb70b..614a0e6d 100644 --- 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 baaa02be..47d6bcc2 100644 --- 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 8ca1494e..06380434 100644 --- 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 3ec2a31c..7718d84f 100644 --- 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 184931ef..aa79980f 100644 --- 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 98595996..6b9ce140 100644 --- 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 857d96c9..2989c8e0 100644 --- 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 12f20893..d99d37a8 100644 --- 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 94ceac7e..b90c0214 100644 --- 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 0b0150ea..ed52394c 100644 --- 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 9d2a7c6b..fbae0086 100644 --- 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 -- 2.30.2