Cleanup imports

Remove unused, import explicitly.

Internal-tag: [#68702]
Signed-off-by: Wiktoria Kuna <[email protected]>

rowhammer_tester/gateware/bist.py

@@ -2,7 +2,7 @@
 from litex.soc.integration.doc import AutoDoc, ModuleDoc
 from litex.soc.interconnect import stream
 from litex.soc.interconnect.csr import CSR, AutoCSR, CSRStatus, CSRStorage
-from migen import *
+from migen import FSM, READ_FIRST, If, Memory, Module, NextState, NextValue, Signal
 from migen.genlib.coding import Decoder as OneHotDecoder
 
 

rowhammer_tester/gateware/payload_executor.py

@@ -5,7 +5,18 @@
 from litedram.core.refresher import Refresher
 from litex.soc.integration.doc import AutoDoc, ModuleDoc
 from litex.soc.interconnect.csr import CSR, AutoCSR, CSRField, CSRStatus, CSRStorage
-from migen import *
+from migen import (
+    FSM,
+    Cat,
+    If,
+    Module,
+    NextState,
+    NextValue,
+    Replicate,
+    ResetInserter,
+    Signal,
+    log2_int,
+)
 from migen.genlib.coding import Decoder as OneHotDecoder
 
 

rowhammer_tester/gateware/rowhammer.py

@@ -1,6 +1,6 @@
 from litex.soc.integration.doc import AutoDoc, ModuleDoc
 from litex.soc.interconnect.csr import AutoCSR, CSRStatus, CSRStorage
-from migen import *
+from migen import Case, If, Module, Signal
 
 
 class RowHammerDMA(Module, AutoCSR, AutoDoc, ModuleDoc):

rowhammer_tester/scripts/analyzer.py

@@ -1,9 +1,13 @@
 #!/usr/bin/env python3
 
-import argparse
 import sys
 
-from litescope.software.litescope_cli import *
+from litescope.software.litescope_cli import (
+    LiteScopeAnalyzerDriver,
+    add_triggers,
+    get_signals,
+    parse_args,
+)
 
 from rowhammer_tester.scripts.utils import RemoteClient, get_generated_file, read_ident
 

rowhammer_tester/scripts/execute_payload.py

@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
 import itertools
-import os
-import sys
 import time
 
-from rowhammer_tester.gateware.payload_executor import Decoder, Encoder, OpCode
+from rowhammer_tester.gateware.payload_executor import Encoder, OpCode
 from rowhammer_tester.scripts.utils import (
     DRAMAddressConverter,
     RemoteClient,

rowhammer_tester/scripts/hw_rowhammer.py

@@ -1,22 +1,10 @@
 #!/usr/bin/env python3
 
-import argparse
-import random
 import time
 from collections import defaultdict
-from math import ceil
 
-from rowhammer_tester.gateware.payload_executor import Decoder, Encoder, OpCode
 from rowhammer_tester.scripts.rowhammer import RowHammer, main
-from rowhammer_tester.scripts.utils import (
-    DRAMAddressConverter,
-    RemoteClient,
-    hw_memset,
-    hw_memtest,
-    litex_server,
-    memwrite,
-    setup_inverters,
-)
+from rowhammer_tester.scripts.utils import hw_memset, hw_memtest, memwrite, setup_inverters
 
 ################################################################################
 

rowhammer_tester/scripts/logs2plot.py

@@ -6,7 +6,6 @@
 
 import argparse
 import json
-import os
 from math import floor
 from pathlib import Path
 

rowhammer_tester/scripts/logs2vis.py

@@ -7,7 +7,6 @@
 import argparse
 import datetime
 import json
-import os
 from pathlib import Path
 
 from rowhammer_tester.scripts.utils import get_generated_file

rowhammer_tester/scripts/mem.py

@@ -2,17 +2,20 @@
 
 import argparse
 import itertools
-import os
 import random
 import sys
-
-from rowhammer_tester.scripts.read_level import (
-    Settings,
-    read_level,
-    read_level_hardcoded,
-    write_level_hardcoded,
+import time
+
+from rowhammer_tester.scripts.utils import (
+    RemoteClient,
+    compare,
+    litex_server,
+    memread,
+    memspeed,
+    memwrite,
+    read_ident,
+    sdram_hardware_control,
 )
-from rowhammer_tester.scripts.utils import *
 
 
 # Perform a memory test using a random data pattern and linear addressing

rowhammer_tester/scripts/playbook/payload_generators/half_double_analysis.py

@@ -1,22 +1,23 @@
 import math
-from collections import OrderedDict, defaultdict
+from collections import defaultdict
 from enum import Enum
 
-from rowhammer_tester.gateware.payload_executor import Decoder, Encoder, OpCode
 from rowhammer_tester.scripts.playbook.lib import (
     generate_payload_from_row_list,
     get_range_from_rows,
 )
 from rowhammer_tester.scripts.playbook.payload_generators import PayloadGenerator
-from rowhammer_tester.scripts.playbook.row_generators import RowGenerator
+
+# The following imports allow to fetch appropriate classes via `get_by_name` method
+from rowhammer_tester.scripts.playbook.row_generators import RowGenerator  # noqa: F401
 from rowhammer_tester.scripts.playbook.row_generators.half_double import HalfDoubleRowGenerator
-from rowhammer_tester.scripts.playbook.row_mappings import (
+from rowhammer_tester.scripts.playbook.row_mappings import (  # noqa: F401
     RowMapping,
     TrivialRowMapping,
     TypeARowMapping,
     TypeBRowMapping,
 )
-from rowhammer_tester.scripts.utils import get_expected_execution_cycles, validate_keys
+from rowhammer_tester.scripts.utils import validate_keys
 
 
 class HalfDoubleAnalysisState(Enum):

rowhammer_tester/scripts/playbook/payload_generators/hammer_tolerance.py

@@ -5,7 +5,9 @@
     get_range_from_rows,
 )
 from rowhammer_tester.scripts.playbook.payload_generators import PayloadGenerator
-from rowhammer_tester.scripts.playbook.row_mappings import (
+
+# The following imports allow to fetch appropriate Row Mapping class via `get_by_name` method
+from rowhammer_tester.scripts.playbook.row_mappings import (  # noqa: F401
     RowMapping,
     TrivialRowMapping,
     TypeARowMapping,

rowhammer_tester/scripts/playbook/payload_generators/row_list.py

@@ -1,11 +1,15 @@
-from collections import OrderedDict, defaultdict
-
 from rowhammer_tester.scripts.playbook.lib import generate_payload_from_row_list
 from rowhammer_tester.scripts.playbook.payload_generators import PayloadGenerator
 from rowhammer_tester.scripts.playbook.row_generators import RowGenerator
-from rowhammer_tester.scripts.playbook.row_generators.even_rows import EvenRowGenerator
-from rowhammer_tester.scripts.playbook.row_generators.half_double import HalfDoubleRowGenerator
-from rowhammer_tester.scripts.playbook.row_mappings import (
+
+# The following imports allow to fetch appropriate classes via `get_by_name` method
+from rowhammer_tester.scripts.playbook.row_generators.even_rows import (  # noqa: F401
+    EvenRowGenerator,
+)
+from rowhammer_tester.scripts.playbook.row_generators.half_double import (  # noqa: F401
+    HalfDoubleRowGenerator,
+)
+from rowhammer_tester.scripts.playbook.row_mappings import (  # noqa: F401
     RowMapping,
     TrivialRowMapping,
     TypeARowMapping,

rowhammer_tester/scripts/playbook/playbook.py

@@ -5,13 +5,17 @@
 from collections import defaultdict
 
 from rowhammer_tester.scripts.playbook.payload_generators import PayloadGenerator
-from rowhammer_tester.scripts.playbook.payload_generators.half_double_analysis import (
+
+# The following imports allow to fetch an appropriate Payload Generator with `get_by_name` method
+from rowhammer_tester.scripts.playbook.payload_generators.half_double_analysis import (  # noqa: F401, E501
     HalfDoubleAnalysisPayloadGenerator,
 )
-from rowhammer_tester.scripts.playbook.payload_generators.hammer_tolerance import (
+from rowhammer_tester.scripts.playbook.payload_generators.hammer_tolerance import (  # noqa: F401
     HammerTolerancePayloadGenerator,
 )
-from rowhammer_tester.scripts.playbook.payload_generators.row_list import RowListPayloadGenerator
+from rowhammer_tester.scripts.playbook.payload_generators.row_list import (  # noqa: F401
+    RowListPayloadGenerator,
+)
 from rowhammer_tester.scripts.utils import (
     DRAMAddressConverter,
     RemoteClient,

rowhammer_tester/scripts/playbook/row_generators/even_rows.py

@@ -1,11 +1,5 @@
 from rowhammer_tester.scripts.playbook.lib import get_range_from_rows
 from rowhammer_tester.scripts.playbook.row_generators import RowGenerator
-from rowhammer_tester.scripts.playbook.row_mappings import (
-    RowMapping,
-    TrivialRowMapping,
-    TypeARowMapping,
-    TypeBRowMapping,
-)
 from rowhammer_tester.scripts.utils import validate_keys
 
 

rowhammer_tester/scripts/playbook/row_generators/half_double.py

@@ -1,12 +1,6 @@
 from collections import defaultdict
 
 from rowhammer_tester.scripts.playbook.row_generators import RowGenerator
-from rowhammer_tester.scripts.playbook.row_mappings import (
-    RowMapping,
-    TrivialRowMapping,
-    TypeARowMapping,
-    TypeBRowMapping,
-)
 from rowhammer_tester.scripts.utils import validate_keys
 
 

rowhammer_tester/scripts/read_level.py

@@ -6,7 +6,19 @@
 from functools import reduce
 from operator import or_
 
-from rowhammer_tester.scripts.utils import *
+from rowhammer_tester.scripts.utils import (
+    RemoteClient,
+    compare,
+    get_litedram_settings,
+    read_ident,
+    sdram_software_control,
+)
+
+# Fetch DFII command signals form the generated sdram_init.py file
+try:
+    from sdram_init import *
+except ModuleNotFoundError:
+    raise ModuleNotFoundError("sdram_init not loaded")
 
 # DRAM commands ----------------------------------
 

rowhammer_tester/scripts/rowhammer.py

@@ -5,7 +5,6 @@
 import os
 import random
 import subprocess
-import sys
 import time
 from pathlib import Path
 
@@ -20,7 +19,6 @@
     litex_server,
     memcheck,
     memfill,
-    memwrite,
     read_ident,
 )
 

rowhammer_tester/scripts/spd_eeprom.py

@@ -2,14 +2,11 @@
 
 import argparse
 import itertools
-import math
 import os
-import sys
 import time
 
 import pexpect
-from litedram.modules import SDRAMModule, parse_spd_hexdump
-from pexpect import replwrap
+from litedram.modules import SDRAMModule
 
 from rowhammer_tester.scripts.utils import (
     RemoteClient,

rowhammer_tester/scripts/utils.py

@@ -12,7 +12,7 @@
 
 from migen import log2_int
 
-from rowhammer_tester.gateware.payload_executor import Decoder, Encoder, OpCode
+from rowhammer_tester.gateware.payload_executor import OpCode
 
 # ###########################################################################
 

rowhammer_tester/targets/arty.py

@@ -6,7 +6,7 @@
 from litex.soc.cores.clock import S7IDELAYCTRL, S7PLL
 from litex.soc.integration.builder import Builder
 from litex_boards.platforms import digilent_arty
-from migen import *
+from migen import ClockDomain, Module
 
 from rowhammer_tester.targets import common
 

rowhammer_tester/targets/common.py

@@ -4,7 +4,6 @@
 import logging
 import math
 import os
-import time
 
 import git
 import litedram.modules as litedram_modules
@@ -19,7 +18,8 @@
 from liteeth.frontend.etherbone import LiteEthEtherbone
 from liteeth.phy import LiteEthS7PHYRGMII
 from liteeth.phy.model import LiteEthPHYModel
-from litex.build.generic_platform import *
+from litex.build.generic_platform import Pins, Subsignal
+from litex.build.io import CRG
 from litex.build.sim import SimPlatform as _SimPlatform
 from litex.build.sim.config import SimConfig
 from litex.soc import doc
@@ -29,9 +29,9 @@
 from litex.soc.integration.soc import SoCRegion
 from litex.soc.integration.soc_core import SoCCore, colorer, soc_core_argdict, soc_core_args
 from litex.soc.interconnect import wishbone
-from litex.soc.interconnect.csr import AutoCSR, CSRStatus, CSRStorage
+from litex.soc.interconnect.csr import AutoCSR, CSRStorage
 from litex.tools.litex_sim import get_sdram_phy_settings
-from migen import *
+from migen import READ_FIRST, Constant, Memory, Module, Signal
 
 import rowhammer_tester.targets.modules as local_modules
 from rowhammer_tester.gateware.bist import PatternMemory, Reader, Writer

rowhammer_tester/targets/ddr4_datacenter_test_board.py

@@ -1,15 +1,12 @@
 #!/usr/bin/env python3
 
-import math
-
 from litedram.phy import k7ddrphy
-from liteeth.phy import LiteEthS7PHYRGMII
 from litex.build.xilinx.vivado import vivado_build_argdict, vivado_build_args
 from litex.soc.cores.bitbang import I2CMaster, I2CMasterSim
 from litex.soc.cores.clock import S7IDELAYCTRL, S7PLL
 from litex.soc.integration.builder import Builder
 from litex_boards.platforms import antmicro_datacenter_ddr4_test_board
-from migen import *
+from migen import ClockDomain, Module
 
 from rowhammer_tester.targets import common
 

rowhammer_tester/targets/ddr5_test_board.py

@@ -1,16 +1,13 @@
 #!/usr/bin/env python3
 
-import math
-
 from litedram.phy import ddr5
 from litedram.phy.ddr5.s7phy import Xilinx7SeriesAsyncFIFOWrap
-from liteeth.phy import LiteEthS7PHYRGMII
 from litex.build.xilinx.vivado import vivado_build_argdict, vivado_build_args
 from litex.soc.cores.clock import S7IDELAYCTRL, S7MMCM, S7PLL
 from litex.soc.integration.builder import Builder
-from litex.soc.interconnect.csr import CSR, AutoCSR, CSRStatus, CSRStorage
+from litex.soc.interconnect.csr import AutoCSR, CSRStorage
 from litex_boards.platforms import antmicro_ddr5_test_board
-from migen import *
+from migen import ClockDomain, ClockSignal, If, Instance, Module, Signal
 
 from rowhammer_tester.targets import common
 

rowhammer_tester/targets/ddr5_tester.py

@@ -1,18 +1,13 @@
 #!/usr/bin/env python3
 
-import math
-
 from litedram.phy import ddr5
-from liteeth.phy import LiteEthS7PHYRGMII
 from litex.build.xilinx.vivado import vivado_build_argdict, vivado_build_args
 from litex.soc.cores.bitbang import I2CMaster
 from litex.soc.cores.clock import S7IDELAYCTRL, S7MMCM, S7PLL
 from litex.soc.integration.builder import Builder
 from litex.soc.integration.doc import ModuleDoc
 from litex_boards.platforms import antmicro_ddr5_tester
-from migen import *
-from migen.genlib.cdc import MultiReg
-from migen.genlib.resetsync import AsyncResetSynchronizer
+from migen import ClockDomain, ClockSignal, Module
 
 from rowhammer_tester.targets import common