From 65531388555a7924e9ebde840635348bc5e53b0b Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Mon, 7 Nov 2022 23:00:11 -0800 Subject: [PATCH] rename compiler_ir2.py/register_allocator2.py to compiler_ir.py/register_allocator.py --- .../{test_compiler_ir2.py => test_compiler_ir.py} | 9 +++++---- ...ster_allocator2.py => test_register_allocator.py} | 8 ++++---- .../_tests/test_toom_cook.py | 12 ++++++------ .../{compiler_ir2.py => compiler_ir.py} | 0 ...{register_allocator2.py => register_allocator.py} | 6 +++--- src/bigint_presentation_code/toom_cook.py | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) rename src/bigint_presentation_code/_tests/{test_compiler_ir2.py => test_compiler_ir.py} (99%) rename src/bigint_presentation_code/_tests/{test_register_allocator2.py => test_register_allocator.py} (98%) rename src/bigint_presentation_code/{compiler_ir2.py => compiler_ir.py} (100%) rename src/bigint_presentation_code/{register_allocator2.py => register_allocator.py} (99%) diff --git a/src/bigint_presentation_code/_tests/test_compiler_ir2.py b/src/bigint_presentation_code/_tests/test_compiler_ir.py similarity index 99% rename from src/bigint_presentation_code/_tests/test_compiler_ir2.py rename to src/bigint_presentation_code/_tests/test_compiler_ir.py index 833dbc9..ba29ee0 100644 --- a/src/bigint_presentation_code/_tests/test_compiler_ir2.py +++ b/src/bigint_presentation_code/_tests/test_compiler_ir.py @@ -1,9 +1,10 @@ import unittest -from bigint_presentation_code.compiler_ir2 import (GPR_SIZE_IN_BYTES, BaseTy, Fn, - FnAnalysis, GenAsmState, Loc, LocKind, OpKind, OpStage, - PreRASimState, ProgramPoint, - SSAVal, Ty) +from bigint_presentation_code.compiler_ir import (GPR_SIZE_IN_BYTES, BaseTy, + Fn, FnAnalysis, GenAsmState, + Loc, LocKind, OpKind, + OpStage, PreRASimState, + ProgramPoint, SSAVal, Ty) class TestCompilerIR(unittest.TestCase): diff --git a/src/bigint_presentation_code/_tests/test_register_allocator2.py b/src/bigint_presentation_code/_tests/test_register_allocator.py similarity index 98% rename from src/bigint_presentation_code/_tests/test_register_allocator2.py rename to src/bigint_presentation_code/_tests/test_register_allocator.py index f34ed98..d30ea12 100644 --- a/src/bigint_presentation_code/_tests/test_register_allocator2.py +++ b/src/bigint_presentation_code/_tests/test_register_allocator.py @@ -1,12 +1,12 @@ import sys import unittest -from bigint_presentation_code.compiler_ir2 import (Fn, GenAsmState, OpKind, - SSAVal) -from bigint_presentation_code.register_allocator2 import allocate_registers +from bigint_presentation_code.compiler_ir import (Fn, GenAsmState, OpKind, + SSAVal) +from bigint_presentation_code.register_allocator import allocate_registers -class TestCompilerIR(unittest.TestCase): +class TestRegisterAllocator(unittest.TestCase): maxDiff = None def make_add_fn(self): diff --git a/src/bigint_presentation_code/_tests/test_toom_cook.py b/src/bigint_presentation_code/_tests/test_toom_cook.py index 3188430..96dc318 100644 --- a/src/bigint_presentation_code/_tests/test_toom_cook.py +++ b/src/bigint_presentation_code/_tests/test_toom_cook.py @@ -1,12 +1,12 @@ import unittest from typing import Callable -from bigint_presentation_code.compiler_ir2 import (GPR_SIZE_IN_BYTES, - BaseSimState, Fn, - GenAsmState, OpKind, - PostRASimState, - PreRASimState) -from bigint_presentation_code.register_allocator2 import allocate_registers +from bigint_presentation_code.compiler_ir import (GPR_SIZE_IN_BYTES, + BaseSimState, Fn, + GenAsmState, OpKind, + PostRASimState, + PreRASimState) +from bigint_presentation_code.register_allocator import allocate_registers from bigint_presentation_code.toom_cook import ToomCookInstance, simple_mul diff --git a/src/bigint_presentation_code/compiler_ir2.py b/src/bigint_presentation_code/compiler_ir.py similarity index 100% rename from src/bigint_presentation_code/compiler_ir2.py rename to src/bigint_presentation_code/compiler_ir.py diff --git a/src/bigint_presentation_code/register_allocator2.py b/src/bigint_presentation_code/register_allocator.py similarity index 99% rename from src/bigint_presentation_code/register_allocator2.py rename to src/bigint_presentation_code/register_allocator.py index 278693d..b3f682e 100644 --- a/src/bigint_presentation_code/register_allocator2.py +++ b/src/bigint_presentation_code/register_allocator.py @@ -11,9 +11,9 @@ from typing import Iterable, Iterator, Mapping, TextIO from cached_property import cached_property from nmutil.plain_data import plain_data -from bigint_presentation_code.compiler_ir2 import (BaseTy, Fn, FnAnalysis, Loc, - LocSet, ProgramRange, - SSAVal, Ty) +from bigint_presentation_code.compiler_ir import (BaseTy, Fn, FnAnalysis, Loc, + LocSet, ProgramRange, SSAVal, + Ty) from bigint_presentation_code.type_util import final from bigint_presentation_code.util import FMap, InternedMeta, OFSet, OSet diff --git a/src/bigint_presentation_code/toom_cook.py b/src/bigint_presentation_code/toom_cook.py index aa18967..7e9748c 100644 --- a/src/bigint_presentation_code/toom_cook.py +++ b/src/bigint_presentation_code/toom_cook.py @@ -8,7 +8,7 @@ from typing import Any, Generic, Iterable, Mapping, TypeVar, Union from nmutil.plain_data import plain_data -from bigint_presentation_code.compiler_ir2 import (Fn, OpKind, SSAVal) +from bigint_presentation_code.compiler_ir import Fn, OpKind, SSAVal from bigint_presentation_code.matrix import Matrix from bigint_presentation_code.type_util import Literal, final -- 2.30.2