renaming stencil architecture everywhere from aarch64 to arm64

This commit is contained in:
Nicolas 2025-11-11 08:47:52 +01:00
parent d2db667741
commit 37c68bc13d
5 changed files with 15 additions and 15 deletions

View File

@ -83,15 +83,15 @@ jobs:
echo "- Patch code..." echo "- Patch code..."
bin/coparun bin/test.copapy bin/test.copapy.bin bin/coparun bin/test.copapy bin/test.copapy.bin
#qemu-aarch64 bin/coparun-aarch64 bin/test-aarch64.copapy bin/test-aarch64.copapy.bin #qemu-aarch64 bin/coparun-aarch64 bin/test-arm64.copapy bin/test-arm64.copapy.bin
objdump -D -b binary -m i386:x86-64 --adjust-vma=0x1000 bin/test.copapy.bin > bin/test.copapy.asm objdump -D -b binary -m i386:x86-64 --adjust-vma=0x1000 bin/test.copapy.bin > bin/test.copapy.asm
echo '<p>test.copapy.asm</p>' >> $GITHUB_STEP_SUMMARY echo '<p>test.copapy.asm</p>' >> $GITHUB_STEP_SUMMARY
python tools/clean_asm.py bin/test.copapy.asm >> $GITHUB_STEP_SUMMARY python tools/clean_asm.py bin/test.copapy.asm >> $GITHUB_STEP_SUMMARY
#aarch64-linux-gnu-objdump -D -b binary -m aarch64 --adjust-vma=0x1000 bin/test-aarch64.copapy.bin > bin/test-aarch64.copapy.asm #aarch64-linux-gnu-objdump -D -b binary -m aarch64 --adjust-vma=0x1000 bin/test-arm64.copapy.bin > bin/test-arm64.copapy.asm
#echo '<p>test-aarch64.copapy.asm</p>' >> $GITHUB_STEP_SUMMARY #echo '<p>test-arm64.copapy.asm</p>' >> $GITHUB_STEP_SUMMARY
#python tools/clean_asm.py bin/test-aarch64.copapy.asm >> $GITHUB_STEP_SUMMARY #python tools/clean_asm.py bin/test-arm64.copapy.asm >> $GITHUB_STEP_SUMMARY
objdump -d -x src/copapy/obj/stencils_x86_64_O3.o > bin/stencils_x86_64_O3.asm objdump -d -x src/copapy/obj/stencils_x86_64_O3.o > bin/stencils_x86_64_O3.asm
echo '<p>stencils_x86_64_O3.asm</p>' >> $GITHUB_STEP_SUMMARY echo '<p>stencils_x86_64_O3.asm</p>' >> $GITHUB_STEP_SUMMARY

View File

@ -54,7 +54,7 @@ def test_compile():
out = [Write(r) for r in ret] out = [Write(r) for r in ret]
sdb = backend.stencil_db_from_package('aarch64') sdb = backend.stencil_db_from_package('arm64')
il, variables = compile_to_dag(out, sdb) il, variables = compile_to_dag(out, sdb)
# run program command # run program command
@ -69,12 +69,12 @@ def test_compile():
print('* Data to runner:') print('* Data to runner:')
il.print() il.print()
il.to_file('bin/test-aarch64.copapy') il.to_file('bin/test-arm64.copapy')
if not check_for_qemu(): if not check_for_qemu():
warnings.warn("qemu-aarch64 not found, aarch64 test skipped!", UserWarning) warnings.warn("qemu-aarch64 not found, aarch64 test skipped!", UserWarning)
else: else:
command = ['bin/coparun-aarch64', 'bin/test-aarch64.copapy'] command = ['bin/coparun-aarch64', 'bin/test-arm64.copapy']
result = run_command(qemu_command + command) result = run_command(qemu_command + command)
print('* Output from runner:\n--') print('* Output from runner:\n--')
print(result) print(result)

View File

@ -95,7 +95,7 @@ def test_compile():
#ret_test += [c_i, v2] #ret_test += [c_i, v2]
#ret_ref += [9, 4.44, -4.44] #ret_ref += [9, 4.44, -4.44]
sdb = backend.stencil_db_from_package('aarch64') sdb = backend.stencil_db_from_package('arm64')
dw, variables = compile_to_dag(out, sdb) dw, variables = compile_to_dag(out, sdb)
#dw.write_com(_binwrite.Command.READ_DATA) #dw.write_com(_binwrite.Command.READ_DATA)
@ -119,13 +119,13 @@ def test_compile():
print('* Data to runner:') print('* Data to runner:')
dw.print() dw.print()
dw.to_file('bin/test-aarch64.copapy') dw.to_file('bin/test-arm64.copapy')
if not check_for_qemu(): if not check_for_qemu():
warnings.warn("qemu-aarch64 not found, aarch64 test skipped!", UserWarning) warnings.warn("qemu-aarch64 not found, aarch64 test skipped!", UserWarning)
return return
command = ['bin/coparun-aarch64', 'bin/test-aarch64.copapy'] + ['bin/test-aarch64.copapy.bin'] command = ['bin/coparun-aarch64', 'bin/test-arm64.copapy'] + ['bin/test-arm64.copapy.bin']
result = run_command(qemu_command + command) result = run_command(qemu_command + command)
print('* Output from runner:\n--') print('* Output from runner:\n--')
print(result) print(result)

View File

@ -1,8 +1,8 @@
python tools/make_example.py python tools/make_example.py
REM wsl qemu-aarch64 bin/coparun-aarch64 bin/test-aarch64.copapy bin/test-aarch64.copapy.bin REM wsl qemu-aarch64 bin/coparun-aarch64 bin/test-arm64.copapy bin/test-arm64.copapy.bin
REM wsl aarch64-linux-gnu-objdump -D -b binary -m aarch64 --adjust-vma=0x5000 bin/test-aarch64.copapy.bin REM wsl aarch64-linux-gnu-objdump -D -b binary -m aarch64 --adjust-vma=0x5000 bin/test-arm64.copapy.bin
REM wsl aarch64-linux-gnu-objdump -D -b binary -m aarch64 --adjust-vma=0x5000 bin/test-aarch64.copapy2.bin REM wsl aarch64-linux-gnu-objdump -D -b binary -m aarch64 --adjust-vma=0x5000 bin/test-arm64.copapy2.bin
bin\coparun bin/test.copapy bin/test.copapy.bin bin\coparun bin/test.copapy bin/test.copapy.bin
wsl objdump -D -b binary -m i386:x86-64 --adjust-vma=0x500000 bin/test.copapy.bin wsl objdump -D -b binary -m i386:x86-64 --adjust-vma=0x500000 bin/test.copapy.bin

View File

@ -52,7 +52,7 @@ def compile_to_x86() -> None:
def compile_to_aarch64() -> None: def compile_to_aarch64() -> None:
"""Test compilation of a simple program for aarch64.""" """Test compilation of a simple program for arm64."""
c1 = variable(9.0) c1 = variable(9.0)
#ret = [c1 / 4, c1 / -4, c1 // 4, c1 // -4, (c1 * -1) // 4] #ret = [c1 / 4, c1 / -4, c1 // 4, c1 // -4, (c1 * -1) // 4]
@ -71,7 +71,7 @@ def compile_to_aarch64() -> None:
print('* Data to runner:') print('* Data to runner:')
dw.print() dw.print()
dw.to_file('bin/test-aarch64.copapy') dw.to_file('bin/test-arm64.copapy')
if __name__ == "__main__": if __name__ == "__main__":