Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate uarch instruction set after build #108

Closed
wants to merge 3 commits into from
Closed

Validate uarch instruction set after build #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d61ff5b
Align uarch-ram to 4 bytes.
mpernambuco Jul 12, 2023
6799c7c
Validate uarch instruction set after build
mpernambuco Jul 12, 2023
f2c3e48
Allow passing toolchain prefix as argument to makefile
mpernambuco Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ toolchain-env:
-e GROUP=$$(id -g -n) \
-e UID=$$(id -u) \
-e GID=$$(id -g) \
$(if $(TOOLCHAIN_PREFIX), -e TOOLCHAIN_PREFIX=$(TOOLCHAIN_PREFIX), ) \
-v `pwd`:/opt/cartesi/machine-emulator \
-w /opt/cartesi/machine-emulator \
$(TOOLCHAIN_IMAGE):$(TOOLCHAIN_TAG) /bin/bash
Expand All @@ -193,6 +194,7 @@ toolchain-exec:
-e GROUP=$$(id -g -n) \
-e UID=$$(id -u) \
-e GID=$$(id -g) \
$(if $(TOOLCHAIN_PREFIX), -e TOOLCHAIN_PREFIX=$(TOOLCHAIN_PREFIX), ) \
-v `pwd`:/opt/cartesi/machine-emulator \
-w /opt/cartesi/machine-emulator \
$(TOOLCHAIN_IMAGE):$(TOOLCHAIN_TAG) /bin/bash -c "$(CONTAINER_COMMAND)"
Expand Down
4 changes: 4 additions & 0 deletions uarch/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
*.bin
.DS_Store
.vscode
uarch-ram.elf.insn.txt
uarch-ram.elf.objdump


25 changes: 21 additions & 4 deletions uarch/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ CXX := $(TOOLCHAIN_PREFIX)g++
OBJCOPY := $(TOOLCHAIN_PREFIX)objcopy
OBJDUMP := $(TOOLCHAIN_PREFIX)objdump

#
# Instructions supported by the microarchitecture interpreter (rv64ui)
SUPPORTED_UARCH_INSN := add|addi|addiw|addw|and|andi|auipc|beq|bge|bgeu|blt|bltu|bne|ebreak|fence|jal|jalr|lb|lbu|ld|lh|$\
lhu|lui|lw|lwu|or|ori|sb|sd|sh|sll|slli|slliw|sllw|slt|slti|sltiu|sltu|sra|srai|sraiw|sraw|srl|srli|srliw|srlw|sub|$\
subw|sw|xor|xori

ifeq ($(relwithdebinfo),yes)
OPTFLAGS+=-O2 -DNDEBUG -g
else ifeq ($(release),yes)
Expand Down Expand Up @@ -74,9 +78,9 @@ UARCH_OBJS = $(patsubst %.c,%.uarch_c.o,$(patsubst %.cpp,%.uarch_cpp.o,$(UARCH_S
EMULATOR_OBJS = $(patsubst %.c,%.emulator_c.o,$(patsubst %.cpp,%.emulator_cpp.o,$(EMULATOR_SOURCES)))
TARGETS=$(UARCH_OBJS) $(EMULATOR_OBJS)

.PHONY: all clean
.PHONY: all clean validate-instruction-set

all: $(TARGETS) uarch-ram.bin
all: $(TARGETS) uarch-ram.bin validate-instruction-set

uarch-ram.bin: uarch-ram.elf
$(OBJCOPY) -S -O binary $^ $@
Expand All @@ -100,5 +104,18 @@ uarch-ram-entry.o: uarch-ram-entry.S
$(CC) -o $(@F).tmp -x c $(CFLAGS) -E $(^F)
grep -v '^#' $@.tmp > $@

uarch-ram.elf.insn.txt: uarch-ram.elf.objdump
grep -oP '^\s*[0-9a-f]{8}\:\s+[0-9a-f]{4,8}\s+\K[a-z]\S+' $(^F) | sort -u > $@

uarch-ram.elf.objdump: uarch-ram.elf
@$(OBJDUMP) -M no-aliases -d $(^F) > $@

validate-instruction-set: uarch-ram.elf.insn.txt
@grep -v -w -E "$(SUPPORTED_UARCH_INSN)" $(<F);\
if [ $$? -eq 0 ]; then\
echo "Unsupported uarch instruction(s) detected. See objdump output in in uarch-ram.elf.objdump"; \
false;\
fi

clean:
rm -f *.ld *.elf *.bin *.tmp link.ld *.o
rm -f *.ld *.elf *.bin *.tmp link.ld *.o uarch-ram.elf.insn.txt uarch-ram.elf.objdump
2 changes: 1 addition & 1 deletion uarch/uarch-ram-entry.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <uarch-defines.h>

.section .text.init;
.align 3;
.align 2;
.global _start;
_start:
// Initialize stack
Expand Down