merged fpu_port branch

This commit is contained in:
Blaise Tine
2020-07-31 17:13:22 -04:00
508 changed files with 45407 additions and 41832 deletions

View File

@@ -83,11 +83,11 @@ vx_num_cores:
.type vx_num_cycles, @function
.global vx_num_cycles
vx_num_cycles:
csrr a0, CSR_CYCLL
csrr a0, CSR_CYCLE
ret
.type vx_num_instrs, @function
.global vx_num_instrs
vx_num_instrs:
csrr a0, CSR_INSTL
csrr a0, CSR_INSTRET
ret

View File

@@ -49,7 +49,7 @@ vx_set_sp:
slli a1, a1, 10 # multiply by 1024
csrr a2, CSR_LTID # get local thread id
slli a2, a2, 2 # multiply by 4
lui sp, STACK_BASE_ADDR # load base sp
lui sp, (SHARED_MEM_BASE_ADDR>>12) # load base sp
sub sp, sp, a1 # sub thread block
add sp, sp, a2 # reduce addr collision for perf

View File

@@ -8,7 +8,7 @@ CP = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objcopy
CFLAGS += -march=rv32im -mabi=ilp32 -O3 -Wl,-Bstatic,-T,$(VORTEX_RT_PATH)/linker/vx_link.ld
CFLAGS += -nostartfiles -ffreestanding -fno-exceptions -Wl,--gc-sections
CFLAGS += -I$(VORTEX_RT_PATH)/include
CFLAGS += -I$(VORTEX_RT_PATH)/include -I../../../hw
LDFLAGS += $(VORTEX_RT_PATH)/libvortexrt.a

View File

@@ -3,6 +3,7 @@
#include <vx_intrinsics.h>
#include <vx_print.h>
#include <vx_spawn.h>
#include <VX_config.h>
typedef struct
@@ -100,7 +101,7 @@ int main()
test_wsapwn();
vx_print_str("Shared Memory test\n");
unsigned * ptr = (unsigned *) 0xFFFF0000;
unsigned * ptr = (unsigned *) SHARED_MEM_BASE_ADDR;
unsigned value = 0;
for (int i = 0; i < 5; i++)
{
@@ -112,7 +113,6 @@ int main()
vx_print_str("-------------------\n");
value++;
ptr++;
}
vx_print_str("vx_spawn_warps mat_add_kernel\n");

View File

@@ -125,16 +125,4 @@ void intrinsics_tests()
// Test wspawn
vx_print_str("test_spawn\n");
test_wsapwn();
}
}

View File

@@ -81,14 +81,14 @@ Disassembly of section .text:
80000114: 3a8000ef jal ra,800004bc <test_wsapwn>
80000118: 80001537 lui a0,0x80001
8000011c: ddc50513 addi a0,a0,-548 # 80000ddc <__global_pointer$+0xfffff5d4>
80000120: ffff0437 lui s0,0xffff0
80000120: 6ffff437 lui s0,0x6ffff
80000124: 628000ef jal ra,8000074c <vx_print_str>
80000128: 00000493 li s1,0
8000012c: 80001b37 lui s6,0x80001
80000130: 80001ab7 lui s5,0x80001
80000134: 80001a37 lui s4,0x80001
80000138: 800019b7 lui s3,0x80001
8000013c: 01440913 addi s2,s0,20 # ffff0014 <__global_pointer$+0x7ffee80c>
8000013c: 01440913 addi s2,s0,20 # 6ffff014 <_start-0x10000fec>
80000140: 00942023 sw s1,0(s0)
80000144: 00040593 mv a1,s0
80000148: df0b0513 addi a0,s6,-528 # 80000df0 <__global_pointer$+0xfffff5e8>
@@ -454,7 +454,7 @@ Disassembly of section .text:
80000698: 0005006b 0x5006b
8000069c: 00001197 auipc gp,0x1
800006a0: 16c18193 addi gp,gp,364 # 80001808 <__global_pointer$>
800006a4: f14025f3 csrr a1,mhartid
800006a4: 022025f3 csrr a1,0x22
800006a8: 00a59593 slli a1,a1,0xa
800006ac: 02002673 csrr a2,0x20
800006b0: 00261613 slli a2,a2,0x2
@@ -502,7 +502,7 @@ Disassembly of section .text:
80000710: 00008067 ret
80000714 <vx_thread_gid>:
80000714: f1402573 csrr a0,mhartid
80000714: 02202573 csrr a0,0x22
80000718: 00008067 ret
8000071c <vx_core_id>:

Binary file not shown.

View File

@@ -17,7 +17,7 @@
:1000E80037150080130585DBEF00C0651305400058
:1000F800EF00405EEF00402E13051000EF00805D1A
:10010800371500801305C5DCEF00C063EF00803AA7
:10011800371500801305C5DD3704FFFFEF00806247
:10011800371500801305C5DD37F4FF6FEF008062E7
:1001280093040000371B0080B71A0080371A00803C
:10013800B719008013094401232094009305040093
:1001480013050BDFEF00006E9385040013858ADF2B
@@ -105,14 +105,14 @@
:10066800130504D7032481008320C100832441009B
:10067800130101016F00000D13050000EF00800554
:100688006FF09FFA130500006B00050073255002F8
:100698006B000500971100009381C116F32540F106
:100698006B000500971100009381C116F325200215
:1006A8009395A500732600021316260037F1FF6FF5
:1006B8003301B1403301C100F326100263860600FE
:1006C800130500006B000500678000006B10B50083
:1006D800678000006B000500678000006B40B50074
:1006E800678000006B200500678000006B30000009
:1006F80067800000732510026780000073253002B0
:10070800678000007325000267800000732540F1B0
:1007080067800000732500026780000073252002BF
:10071800678000007325400267800000732550023F
:1007280067800000732560026780000073257002EF
:1007380067800000732500C067800000732520C013