From: Jacob Lifshay Date: Tue, 1 Nov 2022 00:45:26 +0000 (-0700) Subject: add pre_ra_insert_copies X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a0eb92e88b765895095e0db3a9364841713367e8;p=bigint-presentation-code.git add pre_ra_insert_copies --- diff --git a/src/bigint_presentation_code/_tests/test_compiler_ir2.py b/src/bigint_presentation_code/_tests/test_compiler_ir2.py index dfa43e6..288aea6 100644 --- a/src/bigint_presentation_code/_tests/test_compiler_ir2.py +++ b/src/bigint_presentation_code/_tests/test_compiler_ir2.py @@ -66,6 +66,101 @@ class TestCompilerIR(unittest.TestCase): "outputs=(), name='st')", ]) + def test_pre_ra_insert_copies(self): + fn, _arg = self.make_add_fn() + fn.pre_ra_insert_copies() + self.assertEqual([repr(i) for i in fn.ops], [ + "Op(kind=OpKind.FuncArgR3, " + "inputs=[], " + "immediates=[], " + "outputs=(>,), name='arg')", + "Op(kind=OpKind.CopyFromReg, " + "inputs=[>], " + "immediates=[], " + "outputs=(<2#0: >,), name='2')", + "Op(kind=OpKind.SetVLI, " + "inputs=[], " + "immediates=[32], " + "outputs=(>,), name='vl')", + "Op(kind=OpKind.CopyToReg, " + "inputs=[<2#0: >], " + "immediates=[], " + "outputs=(<3#0: >,), name='3')", + "Op(kind=OpKind.SvLd, " + "inputs=[<3#0: >, >], " + "immediates=[0], " + "outputs=(>,), name='ld')", + "Op(kind=OpKind.SetVLI, " + "inputs=[], " + "immediates=[32], " + "outputs=(<4#0: >,), name='4')", + "Op(kind=OpKind.VecCopyFromReg, " + "inputs=[>, <4#0: >], " + "immediates=[], " + "outputs=(<5#0: >,), name='5')", + "Op(kind=OpKind.SvLI, " + "inputs=[>], " + "immediates=[0], " + "outputs=(>,), name='li')", + "Op(kind=OpKind.SetVLI, " + "inputs=[], " + "immediates=[32], " + "outputs=(<6#0: >,), name='6')", + "Op(kind=OpKind.VecCopyFromReg, " + "inputs=[>, <6#0: >], " + "immediates=[], " + "outputs=(<7#0: >,), name='7')", + "Op(kind=OpKind.SetCA, " + "inputs=[], " + "immediates=[], " + "outputs=(>,), name='ca')", + "Op(kind=OpKind.SetVLI, " + "inputs=[], " + "immediates=[32], " + "outputs=(<8#0: >,), name='8')", + "Op(kind=OpKind.VecCopyToReg, " + "inputs=[<5#0: >, <8#0: >], " + "immediates=[], " + "outputs=(<9#0: >,), name='9')", + "Op(kind=OpKind.SetVLI, " + "inputs=[], " + "immediates=[32], " + "outputs=(<10#0: >,), name='10')", + "Op(kind=OpKind.VecCopyToReg, " + "inputs=[<7#0: >, <10#0: >], " + "immediates=[], " + "outputs=(<11#0: >,), name='11')", + "Op(kind=OpKind.SvAddE, " + "inputs=[<9#0: >, <11#0: >, >, " + ">], " + "immediates=[], " + "outputs=(>, >), name='add')", + "Op(kind=OpKind.SetVLI, " + "inputs=[], " + "immediates=[32], " + "outputs=(<12#0: >,), name='12')", + "Op(kind=OpKind.VecCopyFromReg, " + "inputs=[>, <12#0: >], " + "immediates=[], " + "outputs=(<13#0: >,), name='13')", + "Op(kind=OpKind.SetVLI, " + "inputs=[], " + "immediates=[32], " + "outputs=(<14#0: >,), name='14')", + "Op(kind=OpKind.VecCopyToReg, " + "inputs=[<13#0: >, <14#0: >], " + "immediates=[], " + "outputs=(<15#0: >,), name='15')", + "Op(kind=OpKind.CopyToReg, " + "inputs=[<2#0: >], " + "immediates=[], " + "outputs=(<16#0: >,), name='16')", + "Op(kind=OpKind.SvStd, " + "inputs=[<15#0: >, <16#0: >, >], " + "immediates=[0], " + "outputs=(), name='st')", + ]) + def test_sim(self): fn, arg = self.make_add_fn() addr = 0x100 diff --git a/src/bigint_presentation_code/compiler_ir2.py b/src/bigint_presentation_code/compiler_ir2.py index e6ffe4e..382d66c 100644 --- a/src/bigint_presentation_code/compiler_ir2.py +++ b/src/bigint_presentation_code/compiler_ir2.py @@ -56,6 +56,52 @@ class Fn: for op in self.ops: op.pre_ra_sim(state) + def pre_ra_insert_copies(self): + # type: () -> None + orig_ops = list(self.ops) + copied_outputs = {} # type: dict[SSAVal, SSAVal] + self.ops.clear() + for op in orig_ops: + for i in range(len(op.inputs)): + inp = copied_outputs[op.inputs[i]] + if inp.ty.base_ty is BaseTy.I64: + maxvl = inp.ty.reg_len + if inp.ty.reg_len != 1: + setvl = self.append_new_op(OpKind.SetVLI, + immediates=[maxvl]) + vl = setvl.outputs[0] + mv = self.append_new_op(OpKind.VecCopyToReg, + inputs=[inp, vl], maxvl=maxvl) + else: + mv = self.append_new_op(OpKind.CopyToReg, inputs=[inp]) + op.inputs[i] = mv.outputs[0] + elif inp.ty.base_ty is BaseTy.CA \ + or inp.ty.base_ty is BaseTy.VL_MAXVL: + # all copies would be no-ops, so we don't need to copy + op.inputs[i] = inp + else: + assert_never(inp.ty.base_ty) + self.ops.append(op) + for out in op.outputs: + if out.ty.base_ty is BaseTy.I64: + maxvl = out.ty.reg_len + if out.ty.reg_len != 1: + setvl = self.append_new_op(OpKind.SetVLI, + immediates=[maxvl]) + vl = setvl.outputs[0] + mv = self.append_new_op(OpKind.VecCopyFromReg, + inputs=[out, vl], maxvl=maxvl) + else: + mv = self.append_new_op(OpKind.CopyFromReg, + inputs=[out]) + copied_outputs[out] = mv.outputs[0] + elif out.ty.base_ty is BaseTy.CA \ + or out.ty.base_ty is BaseTy.VL_MAXVL: + # all copies would be no-ops, so we don't need to copy + copied_outputs[out] = out + else: + assert_never(out.ty.base_ty) + @unique @final