Before Scratchpad

2019-04-05 17:56:05 -04:00
parent 719ed25213
commit 166b9ae48d
44 changed files with 79 additions and 4687 deletions
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,9 +1,13 @@

-COMP   = /opt/riscv/bin/riscv32-unknown-elf-gcc
+# COMP   = /opt/riscv/bin/riscv32-unknown-elf-gcc
+COMP   = /opt/riscv/bin/riscv32-unknown-linux-gnu-gcc
 CC_FLAGS = -march=rv32im -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib

-DMP  = /opt/riscv/bin/riscv32-unknown-elf-objdump
-CPY  = /opt/riscv/bin/riscv32-unknown-elf-objcopy
+# DMP  = /opt/riscv/bin/riscv32-unknown-elf-objdump
+# CPY  = /opt/riscv/bin/riscv32-unknown-elf-objcopy
+
+DMP  = /opt/riscv/bin/riscv32-unknown-linux-gnu-objdump
+CPY  = /opt/riscv/bin/riscv32-unknown-linux-gnu-objcopy

 VX_LIB = ./vx_os/vx_back/vx_back.s ./vx_os/vx_back/vx_back.c ./vx_os/vx_util/queue.s
 VX_IO  = ./vx_os/vx_io/vx_io.s ./vx_os/vx_io/vx_io.c
--- a/kernel/vortex_test.dump
+++ b/kernel/vortex_test.dump
@@ -7,7 +7,7 @@ Disassembly of section .text:
 80000000 <_start>:
 80000000:	00100513          	li	a0,1
 80000004:	02051073          	csrw	0x20,a0
-80000008:	00800513          	li	a0,8
+80000008:	00100513          	li	a0,1
 8000000c:	02151073          	csrw	0x21,a0
 80000010:	f1401073          	csrw	mhartid,zero
 80000014:	30101073          	csrw	misa,zero
@@ -1516,7 +1516,7 @@ Disassembly of section .text:
 80001630:	00178793          	addi	a5,a5,1
 80001634:	fef42623          	sw	a5,-20(s0)
 80001638:	fec42703          	lw	a4,-20(s0)
-8000163c:	0ff00793          	li	a5,255
+8000163c:	03f00793          	li	a5,63
 80001640:	fae7dae3          	bge	a5,a4,800015f4 <initialize_mats+0x14>
 80001644:	00000013          	nop
 80001648:	01c12403          	lw	s0,28(sp)
@@ -1537,7 +1537,7 @@ Disassembly of section .text:
 8000167c:	fec42783          	lw	a5,-20(s0)
 80001680:	00078e63          	beqz	a5,8000169c <print_matrix+0x48>
 80001684:	fec42783          	lw	a5,-20(s0)
-80001688:	00f7f793          	andi	a5,a5,15
+80001688:	0077f793          	andi	a5,a5,7
 8000168c:	00079863          	bnez	a5,8000169c <print_matrix+0x48>
 80001690:	810007b7          	lui	a5,0x81000
 80001694:	13478513          	addi	a0,a5,308 # 81000134 <main_sp+0xffffa730>
@@ -1556,7 +1556,7 @@ Disassembly of section .text:
 800016c8:	00178793          	addi	a5,a5,1
 800016cc:	fef42623          	sw	a5,-20(s0)
 800016d0:	fec42703          	lw	a4,-20(s0)
-800016d4:	0ff00793          	li	a5,255
+800016d4:	03f00793          	li	a5,63
 800016d8:	fae7d2e3          	bge	a5,a4,8000167c <print_matrix+0x28>
 800016dc:	810007b7          	lui	a5,0x81000
 800016e0:	13c78513          	addi	a0,a5,316 # 8100013c <main_sp+0xffffa738>
@@ -1573,7 +1573,7 @@ Disassembly of section .text:
 80001704:	00812c23          	sw	s0,24(sp)
 80001708:	02010413          	addi	s0,sp,32
 8000170c:	ed5ff0ef          	jal	ra,800015e0 <initialize_mats>
-80001710:	01000693          	li	a3,16
+80001710:	00800693          	li	a3,8
 80001714:	810057b7          	lui	a5,0x81005
 80001718:	9e878613          	addi	a2,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 8000171c:	810047b7          	lui	a5,0x81004
@@ -1587,8 +1587,8 @@ Disassembly of section .text:
 8000173c:	810057b7          	lui	a5,0x81005
 80001740:	9e878513          	addi	a0,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 80001744:	f11ff0ef          	jal	ra,80001654 <print_matrix>
-80001748:	01000713          	li	a4,16
-8000174c:	01000693          	li	a3,16
+80001748:	00800713          	li	a4,8
+8000174c:	00800693          	li	a3,8
 80001750:	810057b7          	lui	a5,0x81005
 80001754:	9e878613          	addi	a2,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 80001758:	810047b7          	lui	a5,0x81004
@@ -1602,8 +1602,8 @@ Disassembly of section .text:
 80001778:	810057b7          	lui	a5,0x81005
 8000177c:	9e878513          	addi	a0,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 80001780:	ed5ff0ef          	jal	ra,80001654 <print_matrix>
-80001784:	01000713          	li	a4,16
-80001788:	01000693          	li	a3,16
+80001784:	00800713          	li	a4,8
+80001788:	00800693          	li	a3,8
 8000178c:	810057b7          	lui	a5,0x81005
 80001790:	9e878613          	addi	a2,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 80001794:	810047b7          	lui	a5,0x81004
@@ -1620,8 +1620,8 @@ Disassembly of section .text:
 800017c0:	00300793          	li	a5,3
 800017c4:	fef42623          	sw	a5,-20(s0)
 800017c8:	fec40593          	addi	a1,s0,-20
-800017cc:	01000713          	li	a4,16
-800017d0:	01000693          	li	a3,16
+800017cc:	00800713          	li	a4,8
+800017d0:	00800693          	li	a3,8
 800017d4:	810057b7          	lui	a5,0x81005
 800017d8:	9e878613          	addi	a2,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 800017dc:	810057b7          	lui	a5,0x81005
@@ -1634,8 +1634,8 @@ Disassembly of section .text:
 800017f8:	9e878513          	addi	a0,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 800017fc:	e59ff0ef          	jal	ra,80001654 <print_matrix>
 80001800:	fec40593          	addi	a1,s0,-20
-80001804:	01000713          	li	a4,16
-80001808:	01000693          	li	a3,16
+80001804:	00800713          	li	a4,8
+80001808:	00800693          	li	a3,8
 8000180c:	810057b7          	lui	a5,0x81005
 80001810:	9e878613          	addi	a2,a5,-1560 # 810049e8 <main_sp+0xffffefe4>
 80001814:	810057b7          	lui	a5,0x81005
--- a/kernel/vortex_test.elf
+++ b/kernel/vortex_test.elf
--- a/kernel/vortex_test.hex
+++ b/kernel/vortex_test.hex
@@ -1,5 +1,5 @@
 :0200000480007A
-:10000000130510007310050213058000731015020C
+:10000000130510007310050213051000731015027C
 :10001000731040F17310103037F1FF7FEF0080193B
 :10002000EF10C06D73000000938B0600130D0700E6
 :10003000130F01009303050013051000635C7500A6
@@ -354,36 +354,36 @@
 :101600009387879EB307F7001307300023A0E700F6
 :10161000B74700810327C4FE131727009387879ECF
 :10162000B307F7001307200023A0E7008327C4FEB9
-:10163000938717002326F4FE0327C4FE9307F00FB9
+:10163000938717002326F4FE0327C4FE9307F003C5
 :10164000E3DAE7FA130000000324C10113010102E9
 :1016500067800000130101FD23261102232481026B
 :1016600013040103232EA4FCB7070081138507117F
 :10167000EFF00F8C232604FE6F0080058327C4FE45
-:10168000638E07008327C4FE93F7F7006398070073
+:10168000638E07008327C4FE93F7770063980700F3
 :10169000B707008113854713EFF08F898327C4FEB6
 :1016A000939727000327C4FDB307F70083A707001C
 :1016B00013850700EFF08F8BB70700811385871321
 :1016C000EFF00F878327C4FE938717002326F4FECD
-:1016D0000327C4FE9307F00FE3D2E7FAB7070081B0
+:1016D0000327C4FE9307F003E3D2E7FAB7070081BC
 :1016E0001385C713EFF0CF84130000008320C102DD
 :1016F000032481021301010367800000130101FE2E
 :10170000232E1100232C810013040102EFF05FED62
-:1017100093060001B75700811386879EB747008163
+:1017100093068000B75700811386879EB7470081E4
 :101720009385879EB73700811385879EEFF0CF940E
 :10173000B707008113850716EFE09FFFB7570081B9
-:101740001385879EEFF01FF1130700019306000138
+:101740001385879EEFF01FF113078000930680003A
 :10175000B75700811386879EB74700819385879E80
 :10176000B73700811385879EEFF00FC1B70700815F
 :101770001385C717EFE0DFFBB75700811385879EFE
-:10178000EFF05FED1307000193060001B7570081EA
+:10178000EFF05FED1307800093068000B7570081EC
 :101790001386879EB74700819385879EB737008160
 :1017A0001385879EEFF04FE7B70700811385071970
 :1017B000EFE01FF8B75700811385879EEFF09FE990
-:1017C000930730002326F4FE9305C4FE130700019F
-:1017D00093060001B75700811386879EB757008193
+:1017C000930730002326F4FE9305C4FE1307800020
+:1017D00093068000B75700811386879EB757008114
 :1017E0001385879EEFF05F8DB70700811385871AF9
 :1017F000EFE01FF4B75700811385879EEFF09FE558
-:101800009305C4FE1307000193060001B75700813A
+:101800009305C4FE1307800093068000B75700813C
 :101810001386879EB75700811385879EEFF01FB30D
 :10182000B70700811385871AEFE09FF0B757008153
 :101830001385879EEFF01FE29307000013850700D2
--- a/kernel/vx_main.c
+++ b/kernel/vx_main.c
@@ -5,10 +5,10 @@ unsigned x[1024] = {0};
 unsigned y[1024] = {0};
 unsigned z[1024] = {0};

-#define MAT_DIM 16
+#define MAT_DIM 8

-#define NUM_COLS 16
-#define NUM_ROWS 16
+#define NUM_COLS 8
+#define NUM_ROWS 8

 void initialize_mats()
 {
--- a/kernel/vx_os/vx_back/vx_back.s
+++ b/kernel/vx_os/vx_back/vx_back.s
@@ -8,7 +8,7 @@
 _start:
    li a0, 1          # Num Warps
    csrw 0x20, a0     # Setting the number of available warps 
-    li a0, 8          # Num Threads
+    li a0, 1          # Num Threads
    csrw 0x21, a0     # Setting the number of available threads
    csrw mhartid,zero
    csrw misa,zero