Skip to content

Commit a1f2626

Browse files
committed
Add CORDIC accelerator (RoCC + MMIO configs, test programs)
1 parent d36db0f commit a1f2626

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

tests/Makefile

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# RISCV Toolchain
33
#################################
44

5-
TARGET = riscv64-unknown-elf
5+
TARGET = /home/willis/chipyard/.conda-env/riscv-tools/bin/riscv64-unknown-elf
66

77
GCC = $(TARGET)-gcc
88
CXX = $(TARGET)-g++
@@ -11,7 +11,10 @@ OBJDUMP = $(TARGET)-objdump
1111
DG = $(TARGET)-gdb
1212
SIZE = $(TARGET)-size
1313

14-
14+
COMMON_SRCS := cordic.c
15+
COMMON_OBJS := $(COMMON_SRCS:.c=.o)
16+
$(COMMON_OBJS): %.o : %.c mmio.h cordic.h
17+
$(GCC) $(CFLAGS) -c $< -o $@
1518
#################################
1619
# Flags
1720
#################################
@@ -21,15 +24,15 @@ ARCH = rv64imafdc
2124
ABI = lp64d
2225
ARCHFLAGS = -march=$(ARCH) -mabi=$(ABI)
2326

24-
CFLAGS = -std=gnu99 -O2 -fno-common -fno-builtin-printf -Wall
27+
CFLAGS = -std=gnu99 -O2 -fno-common -fno-builtin-printf -Wall
2528
CFLAGS += $(ARCHFLAGS)
2629
LDFLAGS = -static
27-
30+
LDLIBS = -lm -Wl,-u,_printf_float
2831
include libgloss.mk
2932

3033
PROGRAMS = pwm blkdev accum charcount nic-loopback big-blkdev pingd \
3134
streaming-passthrough streaming-fir nvdla spiflashread spiflashwrite fft gcd \
32-
hello mt-hello symmetric
35+
hello mt-hello symmetric test SVD_2x2 fft_soft inv_gauss
3336

3437

3538
.DEFAULT_GOAL := default
@@ -45,11 +48,12 @@ spiflash.img: spiflash.py
4548
%.o: %.S
4649
$(GCC) $(CFLAGS) -D__ASSEMBLY__=1 -c $< -o $@
4750

48-
%.o: %.c mmio.h spiflash.h
51+
%.o: %.c mmio.h spiflash.h cordic.h
4952
$(GCC) $(CFLAGS) -c $< -o $@
5053

51-
%.riscv: %.o $(libgloss)
52-
$(GCC) $(LDFLAGS) $< -o $@
54+
%.riscv: %.o $(libgloss) $(COMMON_OBJS)
55+
$(GCC) $(LDFLAGS) $< $(COMMON_OBJS) -o $@ $(LDLIBS)
56+
5357

5458
%.dump: %.riscv
5559
$(OBJDUMP) -D $< > $@
@@ -68,4 +72,4 @@ clean:
6872
default: $(addsuffix .riscv, $(PROGRAMS)) spiflash.img
6973

7074
.PHONY: dumps
71-
dumps: $(addsuffix .dump, $(PROGRAMS))
75+
dumps: $(addsuffix .dump, $(PROGRAMS))

0 commit comments

Comments
 (0)