Skip to content

Commit

Permalink
[2nd Merge Revision] Rebase on the main, and solve the conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
yichao-zh committed Jul 28, 2023
1 parent 243b85d commit bce471f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions software/apps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ include $(RUNTIME_DIR)/runtime.mk

APPS := $(patsubst $(APPS_DIR)/%/main.c,%,$(shell find $(APPS_DIR) -name "main.c"))
DATA := $(patsubst %.args,%.h,$(shell find $(APPS_DIR) -name "data.args"))
ALLPYS := $(patsubst %.py,%.h,$(wildcard $(RUNTIME_DIR)/data/*.py))
BINARIES := $(addprefix $(BIN_DIR)/,$(APPS))
ifeq ($(config), systolic)
ALL := $(APPS)
else
ALL := $(filter-out systolic/%,$(APPS))
endif

ALL_LLVM := $(filter-out synth, $(ALL))
ALL_LLVM := $(filter-out synth, chest_q16, $(ALL))

# Make all applications
all: $(ALL)
Expand All @@ -35,7 +36,7 @@ all_llvm: $(ALL_LLVM)
$(APPS): % : $(BIN_DIR)/% $(APPS_DIR)/Makefile $(shell find $(RUNTIME_DIR)/**.{S,c,h,ld} -type f)

.PHONY: $(BINARIES)
$(BINARIES): $(BIN_DIR)/%: %/main.c.o $(RUNTIME) $(LINKER_SCRIPT) $(DATA) update_opcodes
$(BINARIES): $(BIN_DIR)/%: %/main.c.o $(RUNTIME) $(LINKER_SCRIPT) $(DATA) $(ALLPYS) update_opcodes
mkdir -p $(dir $@)
$(RISCV_CC) -Iinclude $(RISCV_LDFLAGS) -o $@ $< $(RUNTIME) -T$(RUNTIME_DIR)/link.ld
$(RISCV_OBJDUMP) $(RISCV_OBJDUMP_FLAGS) -D $@ > $@.dump
Expand Down

0 comments on commit bce471f

Please sign in to comment.