Skip to content

Commit e2993fc

Browse files
jservjserv
authored
Merge pull request #535 from eleanorLYJ/improve-build-tests
Fix build failures and expand test coverage
2 parents c62d231 + 99c52b9 commit e2993fc

File tree

8 files changed

+162
-41
lines changed

8 files changed

+162
-41
lines changed

‎.github/workflows/main.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ jobs:
3636
host-x64:
3737
needs: [detect-code-related-file-changes]
3838
if: needs.detect-code-related-file-changes.outputs.has_code_related_changes == 'true'
39+
strategy:
40+
fail-fast: false
41+
matrix:
42+
compiler: [gcc, clang]
3943
runs-on: ubuntu-24.04
4044
steps:
4145
- uses: actions/checkout@v4
@@ -49,47 +53,95 @@ jobs:
4953
sudo chmod +x ./llvm.sh
5054
sudo ./llvm.sh 18
5155
shell: bash
56+
- name: Install compiler
57+
id: install_cc
58+
uses: rlalik/setup-cpp-compiler@master
59+
with:
60+
compiler: ${{ matrix.compiler }}
5261
- name: default build
62+
env:
63+
CC: ${{ steps.install_cc.outputs.cc }}
5364
run: make -j$(nproc)
65+
if: ${{ always() }}
5466
- name: check + tests
67+
env:
68+
CC: ${{ steps.install_cc.outputs.cc }}
5569
run: |
70+
make clean
5671
make check -j$(nproc)
5772
make tests -j$(nproc)
5873
make misalign -j$(nproc)
5974
make tool -j$(nproc)
75+
if: ${{ always() }}
6076
- name: diverse configurations
77+
env:
78+
CC: ${{ steps.install_cc.outputs.cc }}
6179
run: |
6280
make distclean && make ENABLE_EXT_M=0 check -j$(nproc)
6381
make distclean && make ENABLE_EXT_A=0 check -j$(nproc)
6482
make distclean && make ENABLE_EXT_F=0 check -j$(nproc)
6583
make distclean && make ENABLE_EXT_C=0 check -j$(nproc)
6684
make distclean && make ENABLE_SDL=0 check -j$(nproc)
85+
make distclean && make ENABLE_Zicsr=0 check -j$(nproc)
86+
make distclean && make ENABLE_MOP_FUSION=0 check -j$(nproc)
87+
make distclean && make ENABLE_BLOCK_CHAINING=0 check -j$(nproc)
88+
make distclean && make ENABLE_Zba=0 check -j$(nproc)
89+
make distclean && make ENABLE_Zbb=0 check -j$(nproc)
90+
make distclean && make ENABLE_Zbc=0 check -j$(nproc)
91+
make distclean && make ENABLE_Zbs=0 check -j$(nproc)
92+
make distclean && make ENABLE_Zifencei=0 check -j$(nproc)
93+
if: ${{ always() }}
6794
- name: misalignment test in block emulation
95+
env:
96+
CC: ${{ steps.install_cc.outputs.cc }}
6897
run: |
6998
make -C tests/system/alignment/
7099
make distclean && make ENABLE_ELF_LOADER=1 ENABLE_EXT_C=0 ENABLE_SYSTEM=1 misalign-in-blk-emu -j$(nproc)
100+
if: ${{ always() }}
71101
- name: MMU test
102+
env:
103+
CC: ${{ steps.install_cc.outputs.cc }}
72104
run: |
73105
make -C tests/system/mmu/
74106
make distclean && make ENABLE_ELF_LOADER=1 ENABLE_SYSTEM=1 mmu-test -j$(nproc)
107+
if: ${{ always() }}
75108
- name: gdbstub test
109+
env:
110+
CC: ${{ steps.install_cc.outputs.cc }}
76111
run: |
77112
make distclean && make ENABLE_GDBSTUB=1 gdbstub-test -j$(nproc)
113+
if: ${{ always() }}
78114
- name: JIT test
115+
env:
116+
CC: ${{ steps.install_cc.outputs.cc }}
79117
run: |
80118
make ENABLE_JIT=1 clean && make ENABLE_JIT=1 check -j$(nproc)
81119
make ENABLE_JIT=1 clean && make ENABLE_EXT_A=0 ENABLE_JIT=1 check -j$(nproc)
82120
make ENABLE_JIT=1 clean && make ENABLE_EXT_F=0 ENABLE_JIT=1 check -j$(nproc)
83121
make ENABLE_JIT=1 clean && make ENABLE_EXT_C=0 ENABLE_JIT=1 check -j$(nproc)
122+
make ENABLE_JIT=1 clean && make ENABLE_EXT_M=0 ENABLE_JIT=1 check -j$(nproc)
123+
make ENABLE_JIT=1 clean && make ENABLE_Zba=0 ENABLE_JIT=1 check -j$(nproc)
124+
make ENABLE_JIT=1 clean && make ENABLE_Zbb=0 ENABLE_JIT=1 check -j$(nproc)
125+
make ENABLE_JIT=1 clean && make ENABLE_Zbc=0 ENABLE_JIT=1 check -j$(nproc)
126+
make ENABLE_JIT=1 clean && make ENABLE_Zbs=0 ENABLE_JIT=1 check -j$(nproc)
127+
make ENABLE_JIT=1 clean && make ENABLE_Zicsr=0 ENABLE_JIT=1 check -j$(nproc)
128+
make ENABLE_JIT=1 clean && make ENABLE_Zifencei=0 ENABLE_JIT=1 check -j$(nproc)
129+
make ENABLE_JIT=1 clean && make ENABLE_MOP_FUSION=0 ENABLE_JIT=1 check -j$(nproc)
130+
make ENABLE_JIT=1 clean && make ENABLE_BLOCK_CHAINING=0 ENABLE_JIT=1 check -j$(nproc)
131+
if: ${{ always() }}
84132
- name: undefined behavior test
85133
run: |
86134
make clean && make ENABLE_UBSAN=1 check -j$(nproc)
87135
make ENABLE_JIT=1 clean && make ENABLE_JIT=1 ENABLE_UBSAN=1 check -j$(nproc)
136+
if: ${{ always() }}
88137
- name: boot Linux kernel test
138+
env:
139+
CC: ${{ steps.install_cc.outputs.cc }}
89140
run: |
90141
make clean && make ENABLE_SYSTEM=1 && make ENABLE_SYSTEM=1 artifact -j$(nproc)
91142
.ci/boot-linux.sh
92143
make ENABLE_SYSTEM=1 clean
144+
if: ${{ always() }}
93145

94146
host-arm64:
95147
needs: [detect-code-related-file-changes]

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BIN := $(OUT)/rv32emu
77
CONFIG_FILE := $(OUT)/.config
88
-include $(CONFIG_FILE)
99

10-
CFLAGS = -std=gnu99 -O2 -Wall -Wextra
10+
CFLAGS = -std=gnu99 -O2 -Wall -Wextra -Werror
1111
CFLAGS += -Wno-unused-label
1212
CFLAGS += -include src/common.h -Isrc/
1313

‎mk/tests.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ $(CACHE_TEST_OUT): $(CACHE_TEST_TARGET)
8383

8484
$(CACHE_TEST_TARGET): $(CACHE_TEST_OBJS)
8585
$(VECHO) " CC\t$@\n"
86-
$(Q)$(CC) $^ -o $@
86+
$(Q)$(CC) $^ -o $@ $(LDFLAGS)
8787

8888
$(CACHE_TEST_OUTDIR)/%.o: $(CACHE_TEST_SRCDIR)/%.c
8989
$(VECHO) " CC\t$@\n"
@@ -95,7 +95,7 @@ $(MAP_TEST_OUT): $(MAP_TEST_TARGET)
9595

9696
$(MAP_TEST_TARGET): $(MAP_TEST_OBJS)
9797
$(VECHO) " CC\t$@\n"
98-
$(Q)$(CC) $^ -o $@
98+
$(Q)$(CC) $^ -o $@ $(LDFLAGS)
9999

100100
$(MAP_TEST_OUTDIR)/%.o: $(MAP_TEST_SRCDIR)/%.c
101101
$(VECHO) " CC\t$@\n"
@@ -107,7 +107,7 @@ $(PATH_TEST_OUT): $(PATH_TEST_TARGET)
107107

108108
$(PATH_TEST_TARGET): $(PATH_TEST_OBJS)
109109
$(VECHO) " CC\t$@\n"
110-
$(Q)$(CC) $^ -o $@
110+
$(Q)$(CC) $^ -o $@ $(LDFLAGS)
111111

112112
$(PATH_TEST_OUTDIR)/%.o: $(PATH_TEST_SRCDIR)/%.c
113113
$(VECHO) " CC\t$@\n"

‎src/emulate.c‎

Lines changed: 54 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ extern struct target_ops gdbstub_ops;
4242
#define IF_imm(i, v) (i->imm == v)
4343

4444
#if RV32_HAS(SYSTEM)
45+
#if !RV32_HAS(JIT)
4546
static bool need_clear_block_map = false;
47+
#endif
4648
static uint32_t reloc_enable_mmu_jalr_addr;
4749
static bool reloc_enable_mmu = false;
4850
bool need_retranslate = false;
@@ -79,14 +81,14 @@ static void __trap_handler(riscv_t *rv);
7981
}
8082

8183
/* FIXME: use more precise methods for updating time, e.g., RTC */
84+
#if RV32_HAS(Zicsr)
8285
static uint64_t ctr = 0;
8386
static inline void update_time(riscv_t *rv)
8487
{
8588
rv->csr_time[0] = ctr & 0xFFFFFFFF;
8689
rv->csr_time[1] = ctr >> 32;
8790
}
8891

89-
#if RV32_HAS(Zicsr)
9092
/* get a pointer to a CSR */
9193
static uint32_t *csr_get_ptr(riscv_t *rv, uint32_t csr)
9294
{
@@ -374,42 +376,45 @@ static uint32_t peripheral_update_ctr = 64;
374376
#endif
375377

376378
/* Interpreter-based execution path */
377-
#define RVOP(inst, code, asm) \
378-
static bool do_##inst(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, \
379-
uint32_t PC) \
380-
{ \
381-
IIF(RV32_HAS(SYSTEM))(ctr++;, ) cycle++; \
382-
code; \
383-
IIF(RV32_HAS(SYSTEM)) \
384-
( \
385-
if (need_handle_signal) { \
386-
need_handle_signal = false; \
387-
return true; \
388-
}, ) nextop : PC += __rv_insn_##inst##_len; \
389-
IIF(RV32_HAS(SYSTEM)) \
390-
(IIF(RV32_HAS(JIT))( \
391-
, if (unlikely(need_clear_block_map)) { \
392-
block_map_clear(rv); \
393-
need_clear_block_map = false; \
394-
rv->csr_cycle = cycle; \
395-
rv->PC = PC; \
396-
return false; \
397-
}), ); \
398-
if (unlikely(RVOP_NO_NEXT(ir))) \
399-
goto end_op; \
400-
const rv_insn_t *next = ir->next; \
401-
MUST_TAIL return next->impl(rv, next, cycle, PC); \
402-
end_op: \
403-
rv->csr_cycle = cycle; \
404-
rv->PC = PC; \
405-
return true; \
379+
#define RVOP(inst, code, asm) \
380+
static bool do_##inst(riscv_t *rv, const rv_insn_t *ir, uint64_t cycle, \
381+
uint32_t PC) \
382+
{ \
383+
IIF(RV32_HAS(SYSTEM))(ctr++;, ) cycle++; \
384+
code; \
385+
IIF(RV32_HAS(SYSTEM)) \
386+
( \
387+
if (need_handle_signal) { \
388+
need_handle_signal = false; \
389+
return true; \
390+
}, ) nextop : PC += __rv_insn_##inst##_len; \
391+
IIF(RV32_HAS(SYSTEM)) \
392+
(IIF(RV32_HAS(JIT))( \
393+
, if (unlikely(need_clear_block_map)) { \
394+
block_map_clear(rv); \
395+
need_clear_block_map = false; \
396+
rv->csr_cycle = cycle; \
397+
rv->PC = PC; \
398+
return false; \
399+
}), ); \
400+
if (unlikely(RVOP_NO_NEXT(ir))) \
401+
goto end_op; \
402+
const rv_insn_t *next = ir->next; \
403+
MUST_TAIL return next->impl(rv, next, cycle, PC); \
404+
end_op: \
405+
rv->csr_cycle = cycle; \
406+
rv->PC = PC; \
407+
return true; \
406408
}
407409

408410
#include "rv32_template.c"
409411
#undef RVOP
410412

411413
/* multiple LUI */
412-
static bool do_fuse1(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, uint32_t PC)
414+
static bool do_fuse1(riscv_t *rv,
415+
const rv_insn_t *ir,
416+
uint64_t cycle,
417+
uint32_t PC)
413418
{
414419
cycle += ir->imm2;
415420
opcode_fuse_t *fuse = ir->fuse;
@@ -426,7 +431,10 @@ static bool do_fuse1(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, uint32_t PC)
426431
}
427432

428433
/* LUI + ADD */
429-
static bool do_fuse2(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, uint32_t PC)
434+
static bool do_fuse2(riscv_t *rv,
435+
const rv_insn_t *ir,
436+
uint64_t cycle,
437+
uint32_t PC)
430438
{
431439
cycle += 2;
432440
rv->X[ir->rd] = ir->imm;
@@ -442,7 +450,10 @@ static bool do_fuse2(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, uint32_t PC)
442450
}
443451

444452
/* multiple SW */
445-
static bool do_fuse3(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, uint32_t PC)
453+
static bool do_fuse3(riscv_t *rv,
454+
const rv_insn_t *ir,
455+
uint64_t cycle,
456+
uint32_t PC)
446457
{
447458
cycle += ir->imm2;
448459
opcode_fuse_t *fuse = ir->fuse;
@@ -466,7 +477,10 @@ static bool do_fuse3(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, uint32_t PC)
466477
}
467478

468479
/* multiple LW */
469-
static bool do_fuse4(riscv_t *rv, rv_insn_t *ir, uint64_t cycle, uint32_t PC)
480+
static bool do_fuse4(riscv_t *rv,
481+
const rv_insn_t *ir,
482+
uint64_t cycle,
483+
uint32_t PC)
470484
{
471485
cycle += ir->imm2;
472486
opcode_fuse_t *fuse = ir->fuse;
@@ -550,6 +564,7 @@ FORCE_INLINE bool insn_is_translatable(uint8_t opcode)
550564
}
551565
#endif
552566

567+
#if RV32_HAS(BLOCK_CHAINING)
553568
FORCE_INLINE bool insn_is_unconditional_branch(uint8_t opcode)
554569
{
555570
switch (opcode) {
@@ -558,7 +573,9 @@ FORCE_INLINE bool insn_is_unconditional_branch(uint8_t opcode)
558573
case rv_insn_jal:
559574
case rv_insn_jalr:
560575
case rv_insn_mret:
576+
#if RV32_HAS(Zicsr)
561577
case rv_insn_csrrw:
578+
#endif
562579
#if RV32_HAS(SYSTEM)
563580
case rv_insn_sret:
564581
#endif
@@ -588,6 +605,7 @@ FORCE_INLINE bool insn_is_direct_branch(uint8_t opcode)
588605
return false;
589606
}
590607
}
608+
#endif
591609

592610
FORCE_INLINE bool insn_is_indirect_branch(uint8_t opcode)
593611
{
@@ -664,6 +682,7 @@ static void block_translate(riscv_t *rv, block_t *block)
664682
block->ir_tail->next = NULL;
665683
}
666684

685+
#if RV32_HAS(MOP_FUSION)
667686
#define COMBINE_MEM_OPS(RW) \
668687
next_ir = ir->next; \
669688
count = 1; \
@@ -800,6 +819,7 @@ static void match_pattern(riscv_t *rv, block_t *block)
800819
}
801820
}
802821
}
822+
#endif
803823

804824
typedef struct {
805825
bool is_constant[N_RV_REGS];

‎src/jit.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,7 @@ static inline void emit_alu64(struct jit_state *state, int op, int src, int dst)
725725
#endif
726726
}
727727

728+
#if RV32_HAS(EXT_M)
728729
static inline void emit_alu64_imm8(struct jit_state *state,
729730
int op,
730731
int src UNUSED,
@@ -742,6 +743,7 @@ static inline void emit_alu64_imm8(struct jit_state *state,
742743
}
743744
#endif
744745
}
746+
#endif
745747

746748
/* Register to register mov */
747749
static inline void emit_mov(struct jit_state *state, int src, int dst)
@@ -1690,6 +1692,7 @@ static void ra_load2(struct jit_state *state, int vm_reg_idx1, int vm_reg_idx2)
16901692
offsetof(riscv_t, X) + 4 * vm_reg_idx2);
16911693
}
16921694

1695+
#if RV32_HAS(EXT_M)
16931696
static void ra_load2_sext(struct jit_state *state,
16941697
int vm_reg_idx1,
16951698
int vm_reg_idx2,
@@ -1733,6 +1736,7 @@ static void ra_load2_sext(struct jit_state *state,
17331736
offsetof(riscv_t, X) + 4 * vm_reg_idx2);
17341737
}
17351738
}
1739+
#endif
17361740

17371741
void parse_branch_history_table(struct jit_state *state, rv_insn_t *ir)
17381742
{

‎src/riscv.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,10 @@ bool rv_has_halted(riscv_t *rv)
621621
void rv_delete(riscv_t *rv)
622622
{
623623
assert(rv);
624-
#if !RV32_HAS(JIT)
624+
#if !RV32_HAS(JIT) || (RV32_HAS(SYSTEM) && !RV32_HAS(ELF_LOADER))
625625
vm_attr_t *attr = PRIV(rv);
626+
#endif
627+
#if !RV32_HAS(JIT)
626628
map_delete(attr->fd_map);
627629
memory_delete(attr->mem);
628630
block_map_destroy(rv);

‎src/t2c.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ FORCE_INLINE LLVMBasicBlockRef t2c_block_map_search(struct LLVM_block_map *map,
7474
T2C_LLVM_GEN_ADDR(rs1, X, ir->rs1);
7575
T2C_LLVM_GEN_ADDR(rs2, X, ir->rs2);
7676
T2C_LLVM_GEN_ADDR(rd, X, ir->rd);
77+
#if RV32_HAS(EXT_C)
7778
T2C_LLVM_GEN_ADDR(ra, X, rv_reg_ra);
7879
T2C_LLVM_GEN_ADDR(sp, X, rv_reg_sp);
80+
#endif
7981
T2C_LLVM_GEN_ADDR(PC, PC, 0);
8082

8183
#define T2C_LLVM_GEN_STORE_IMM32(builder, val, addr) \

0 commit comments

Comments
 (0)