Skip to content

Commit

Permalink
fix: cpuemu build error
Browse files Browse the repository at this point in the history
- cpuemu: lshrdi3.c cause build failure and it's actually not used by any code.
- ci: disable unsupported combination of mainargs and test
  • Loading branch information
xinyangli committed Nov 11, 2024
1 parent 26435c3 commit e8242ec
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
test:
runs-on: ubuntu-latest

continue-on-error: true
strategy:
fail-fast: false
max-parallel: 4
matrix:
test_size: ["test", "ref"]
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ KEEP_LOG_FAILED ?= true
KEEP_LOG_SUCCEED ?= false
TIME := $(shell date --iso=seconds)

ALL = mcf x264 tcc stream linpack gemm whetstone
ifeq ($(mainargs),ref)
ALL = mcf x264 stream linpack gemm whetstone
else
ALL = cpuemu mcf x264 tcc stream linpack gemm whetstone
endif

all: $(BENCH_LIBS) $(ALL)
@echo "OpenPerf [$(words $(ALL)) item(s)]:" $(ALL)
Expand Down
2 changes: 1 addition & 1 deletion src/cpuemu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NAME = cpuemu
# SRCS = test/top.cc resource.S test/mm.cc
# SRCS = train/emu.cc train/lshrdi3.c resource.S bench.cc

SRCS = main.cc resource.S test/top.cc test/mm.cc train/emu.cc train/lshrdi3.c
SRCS = main.cc resource.S test/top.cc test/mm.cc train/emu.cc

CXXFLAGS += -Wno-c++20-compat

Expand Down
24 changes: 0 additions & 24 deletions src/cpuemu/train/lshrdi3.c

This file was deleted.

0 comments on commit e8242ec

Please sign in to comment.