Skip to content

Commit

Permalink
Switch to Linux dev machine (#506)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcauberer committed Mar 23, 2024
1 parent 0be0c6a commit 7ca8aa8
Show file tree
Hide file tree
Showing 12 changed files with 500 additions and 528 deletions.
9 changes: 5 additions & 4 deletions .run/spice.run.xml
@@ -1,11 +1,12 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="spice" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="run -O3 -d ../../media/test-project/test.spice" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Spice" TARGET_NAME="spice" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Spice" RUN_TARGET_NAME="spice">
<configuration default="false" name="spice" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="run -O0 -d -ir ../../media/test-project/test.spice" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Spice" TARGET_NAME="spice" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Spice" RUN_TARGET_NAME="spice">
<envs>
<env name="LLVM_BUILD_INCLUDE_DIR" value="D:/LLVM/build-release/include" />
<env name="LLVM_INCLUDE_DIR" value="D:/LLVM/llvm/include" />
<env name="LLVM_LIB_DIR" value="D:/LLVM/build-release/lib" />
<env name="LLVM_ADDITIONAL_FLAGS" value="-lole32 -lws2_32" />
<env name="LLVM_BUILD_INCLUDE_DIR" value="$PROJECT_DIR$/../llvm-project-latest/build/include" />
<env name="LLVM_INCLUDE_DIR" value="$PROJECT_DIR$/../llvm-project-latest/llvm/include" />
<env name="LLVM_LIB_DIR" value="$PROJECT_DIR$/../llvm-project-latest/build/lib" />
<env name="SPICE_STD_DIR" value="$PROJECT_DIR$/std" />
<env name="SPICE_BOOTSTRAP_DIR" value="$PROJECT_DIR$/src-bootstrap" />
</envs>
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
Expand Down
11 changes: 6 additions & 5 deletions .run/spicetest.run.xml
@@ -1,12 +1,13 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="spicetest" type="CMakeGoogleTestRunConfigurationType" factoryName="Google Test" PROGRAM_PARAMS="--update-refs=false" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Spice" TARGET_NAME="spicetest" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Spice" RUN_TARGET_NAME="spicetest" TEST_MODE="SUITE_TEST">
<configuration default="false" name="spicetest" type="CMakeGoogleTestRunConfigurationType" factoryName="Google Test" PROGRAM_PARAMS="--update-refs=true" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Spice" TARGET_NAME="spicetest" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Spice" RUN_TARGET_NAME="spicetest" TEST_MODE="SUITE_TEST">
<envs>
<env name="LLVM_BUILD_INCLUDE_DIR" value="D:/LLVM/build-release/include" />
<env name="LLVM_INCLUDE_DIR" value="D:/LLVM/llvm/include" />
<env name="LLVM_LIB_DIR" value="D:/LLVM/build-release/lib" />
<env name="RUN_TESTS" value="ON" />
<env name="LLVM_ADDITIONAL_FLAGS" value="-lole32 -lws2_32" />
<env name="LLVM_BUILD_INCLUDE_DIR" value="$PROJECT_DIR$/../llvm-project-latest/build/include" />
<env name="LLVM_INCLUDE_DIR" value="$PROJECT_DIR$/../llvm-project-latest/llvm/include" />
<env name="LLVM_LIB_DIR" value="$PROJECT_DIR$/../llvm-project-latest/build/lib" />
<env name="RUN_TESTS" value="ON" />
<env name="SPICE_STD_DIR" value="$PROJECT_DIR$/std" />
<env name="SPICE_BOOTSTRAP_DIR" value="$PROJECT_DIR$/src-bootstrap" />
</envs>
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
Expand Down
90 changes: 41 additions & 49 deletions test/test-files/benchmark/success-ackermann/assembly.asm
@@ -1,81 +1,73 @@
.text
.def @feat.00;
.scl 3;
.type 0;
.endef
.globl @feat.00
.set @feat.00, 0
.file "source.spice"
.def .L_Z3ackii;
.scl 3;
.type 32;
.endef
.p2align 4, 0x90 # -- Begin function _Z3ackii
.type .L_Z3ackii,@function
.L_Z3ackii: # @_Z3ackii
# %bb.0:
pushq %rsi
subq $32, %rsp
movl %edx, %eax
testl %ecx, %ecx
je .LBB0_5
movl %esi, %eax
testl %edi, %edi
je .LBB0_6
# %bb.1:
movl %ecx, %esi
pushq %rbx
movl %edi, %ebx
jmp .LBB0_2
.p2align 4, 0x90
.LBB0_3: # in Loop: Header=BB0_2 Depth=1
movl $1, %eax
decl %esi
decl %ebx
je .LBB0_5
.LBB0_2: # %if.exit.L2
# =>This Inner Loop Header: Depth=1
testl %eax, %eax
je .LBB0_3
# %bb.6: # %if.exit.L3
# %bb.7: # %if.exit.L3
# in Loop: Header=BB0_2 Depth=1
decl %eax
movl %esi, %ecx
movl %eax, %edx
movl %ebx, %edi
movl %eax, %esi
callq .L_Z3ackii
decl %esi
decl %ebx
jne .LBB0_2
.LBB0_5: # %if.then.L2
.LBB0_5:
popq %rbx
.LBB0_6: # %if.then.L2
incl %eax
addq $32, %rsp
popq %rsi
retq
.Lfunc_end0:
.size .L_Z3ackii, .Lfunc_end0-.L_Z3ackii
# -- End function
.def main;
.scl 2;
.type 32;
.endef
.globl main # -- Begin function main
.p2align 4, 0x90
.type main,@function
main: # @main
.seh_proc main
.Lmain$local:
.type .Lmain$local,@function
.cfi_startproc
# %bb.0:
pushq %rbp
.seh_pushreg %rbp
subq $32, %rsp
.seh_stackalloc 32
leaq 32(%rsp), %rbp
.seh_setframe %rbp, 32
.seh_endprologue
callq __main
movl $3, %ecx
movl $10, %edx
pushq %rax
.cfi_def_cfa_offset 16
movl $3, %edi
movl $10, %esi
callq .L_Z3ackii
leaq .Lprintf.str.0(%rip), %rcx
movl $3, %edx
movl $10, %r8d
movl %eax, %r9d
callq printf
leaq .Lprintf.str.0(%rip), %rdi
movl $3, %esi
movl $10, %edx
movl %eax, %ecx
movb $0, %al
callq printf@PLT
xorl %eax, %eax
addq $32, %rsp
popq %rbp
popq %rcx
.cfi_def_cfa_offset 8
retq
.seh_endproc
.Lfunc_end1:
.size main, .Lfunc_end1-main
.size .Lmain$local, .Lfunc_end1-main
.cfi_endproc
# -- End function
.section .rdata,"dr"
.Lprintf.str.0: # @printf.str.0
.type .Lprintf.str.0,@object # @printf.str.0
.section .rodata.str1.1,"aMS",@progbits,1
.Lprintf.str.0:
.asciz "Ackermann of base m=%d and n=%d: %d"
.size .Lprintf.str.0, 36

.section ".note.GNU-stack","",@progbits
95 changes: 41 additions & 54 deletions test/test-files/benchmark/success-faculty/assembly.asm
@@ -1,16 +1,6 @@
.text
.def @feat.00;
.scl 3;
.type 0;
.endef
.globl @feat.00
.set @feat.00, 0
.file "source.spice"
.def .L_Z7facultyi;
.scl 3;
.type 32;
.endef
.section .rdata,"dr"
.section .rodata.cst16,"aM",@progbits,16
.p2align 4, 0x0 # -- Begin function _Z7facultyi
.LCPI0_0:
.long 0 # 0x0
Expand All @@ -34,27 +24,25 @@
.long 4294967288 # 0xfffffff8
.text
.p2align 4, 0x90
.type .L_Z7facultyi,@function
.L_Z7facultyi: # @_Z7facultyi
# %bb.0:
subq $40, %rsp
movdqa %xmm7, 16(%rsp) # 16-byte Spill
movdqa %xmm6, (%rsp) # 16-byte Spill
# kill: def $ecx killed $ecx def $rcx
# kill: def $edi killed $edi def $rdi
movl $1, %eax
cmpl $2, %ecx
cmpl $2, %edi
jl .LBB0_6
# %bb.1: # %if.exit.L2.preheader
cmpl $9, %ecx
cmpl $9, %edi
jb .LBB0_5
# %bb.2: # %vector.ph
leal -1(%rcx), %edx
movl %edx, %r8d
andl $-8, %r8d
movd %ecx, %xmm0
subl %r8d, %ecx
leal -1(%rdi), %ecx
movl %ecx, %edx
andl $-8, %edx
movd %edi, %xmm0
subl %edx, %edi
pshufd $0, %xmm0, %xmm0 # xmm0 = xmm0[0,0,0,0]
paddd .LCPI0_0(%rip), %xmm0
movl %r8d, %eax
movl %edx, %eax
negl %eax
movdqa .LCPI0_1(%rip), %xmm1 # xmm1 = [1,1,1,1]
movdqa .LCPI0_2(%rip), %xmm2 # xmm2 = [4294967292,4294967292,4294967292,4294967292]
Expand Down Expand Up @@ -96,52 +84,51 @@
pmuludq %xmm2, %xmm1
pmuludq %xmm0, %xmm1
movd %xmm1, %eax
cmpl %r8d, %edx
cmpl %edx, %ecx
je .LBB0_6
.p2align 4, 0x90
.LBB0_5: # %if.exit.L2
# =>This Inner Loop Header: Depth=1
imull %ecx, %eax
leal -1(%rcx), %edx
cmpl $3, %ecx
movl %edx, %ecx
imull %edi, %eax
leal -1(%rdi), %ecx
cmpl $3, %edi
movl %ecx, %edi
jae .LBB0_5
.LBB0_6: # %common.ret
movaps (%rsp), %xmm6 # 16-byte Reload
movaps 16(%rsp), %xmm7 # 16-byte Reload
addq $40, %rsp
retq
.Lfunc_end0:
.size .L_Z7facultyi, .Lfunc_end0-.L_Z7facultyi
# -- End function
.def main;
.scl 2;
.type 32;
.endef
.globl main # -- Begin function main
.p2align 4, 0x90
.type main,@function
main: # @main
.seh_proc main
.Lmain$local:
.type .Lmain$local,@function
.cfi_startproc
# %bb.0:
pushq %rbp
.seh_pushreg %rbp
subq $32, %rsp
.seh_stackalloc 32
leaq 32(%rsp), %rbp
.seh_setframe %rbp, 32
.seh_endprologue
callq __main
movl $10, %ecx
pushq %rax
.cfi_def_cfa_offset 16
movl $10, %edi
callq .L_Z7facultyi
leaq .Lprintf.str.0(%rip), %rcx
movl $10, %edx
movl %eax, %r8d
callq printf
leaq .Lprintf.str.0(%rip), %rdi
movl $10, %esi
movl %eax, %edx
movb $0, %al
callq printf@PLT
xorl %eax, %eax
addq $32, %rsp
popq %rbp
popq %rcx
.cfi_def_cfa_offset 8
retq
.seh_endproc
.Lfunc_end1:
.size main, .Lfunc_end1-main
.size .Lmain$local, .Lfunc_end1-main
.cfi_endproc
# -- End function
.section .rdata,"dr"
.Lprintf.str.0: # @printf.str.0
.type .Lprintf.str.0,@object # @printf.str.0
.section .rodata.str1.1,"aMS",@progbits,1
.Lprintf.str.0:
.asciz "Faculty of %d is: %d"
.size .Lprintf.str.0, 21

.section ".note.GNU-stack","",@progbits

0 comments on commit 7ca8aa8

Please sign in to comment.