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

Jump to bottom

[RV64_DYNAREC] Eliminate redundant vsetvli by tracking its usage #1886

Merged
merged 1 commit into from
Sep 29, 2024
Merged

[RV64_DYNAREC] Eliminate redundant vsetvli by tracking its usage #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions src/dynarec/rv64/dynarec_rv64_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2614,11 +2614,16 @@ int vector_vsetvli(dynarec_rv64_t* dyn, int ninst, int s1, int sew, int vlmul, f
* mu tu sew lmul */
uint32_t vtypei = (0b0 << 7) | (0b0 << 6) | (sew << 3) | vlmul;
uint32_t vl = (int)((float)(16 >> sew) * multiple);
if (vl <= 31) {
VSETIVLI(xZR, vl, vtypei);
} else {
ADDI(s1, xZR, vl);
VSETVLI(xZR, s1, vtypei);

if (dyn->inst_sew == VECTOR_SEWNA || dyn->inst_vl == 0 || dyn->inst_sew != sew || dyn->inst_vl != vl) {
if (vl <= 31) {
VSETIVLI(xZR, vl, vtypei);
} else {
ADDI(s1, xZR, vl);
VSETVLI(xZR, s1, vtypei);
}
}
dyn->inst_sew = sew;
dyn->inst_vl = vl;
return sew;
}
2 changes: 2 additions & 0 deletions src/dynarec/rv64/dynarec_rv64_pass0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
dyn->e.olds[i].v = 0; \
dyn->insts[ninst].f_entry = dyn->f; \
dyn->insts[ninst].vector_sew_entry = dyn->vector_sew; \
dyn->inst_sew = VECTOR_SEWNA; \
dyn->inst_vl = 0; \
if (ninst) \
dyn->insts[ninst - 1].x64.size = dyn->insts[ninst].x64.addr - dyn->insts[ninst - 1].x64.addr;

Expand Down
2 changes: 2 additions & 0 deletions src/dynarec/rv64/dynarec_rv64_pass1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
for (int i = 0; i < 16; ++i) \
dyn->e.olds[i].v = 0; \
dyn->insts[ninst].vector_sew_entry = dyn->vector_sew; \
dyn->inst_sew = VECTOR_SEWNA; \
dyn->inst_vl = 0; \
dyn->e.swapped = 0; \
dyn->e.barrier = 0

Expand Down
2 changes: 2 additions & 0 deletions src/dynarec/rv64/dynarec_rv64_pass2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#define EMIT(A) do {dyn->insts[ninst].size+=4; dyn->native_size+=4;}while(0)
#define NEW_INST \
dyn->vector_sew = dyn->insts[ninst].vector_sew_entry; \
dyn->inst_sew = VECTOR_SEWNA; \
dyn->inst_vl = 0; \
if (ninst) { \
dyn->insts[ninst].address = (dyn->insts[ninst - 1].address + dyn->insts[ninst - 1].size); \
dyn->insts_size += 1 + ((dyn->insts[ninst - 1].x64.size > (dyn->insts[ninst - 1].size / 4)) ? dyn->insts[ninst - 1].x64.size : (dyn->insts[ninst - 1].size / 4)) / 15; \
Expand Down
2 changes: 2 additions & 0 deletions src/dynarec/rv64/dynarec_rv64_pass3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#define MESSAGE(A, ...) if(box64_dynarec_dump) dynarec_log(LOG_NONE, __VA_ARGS__)
#define NEW_INST \
dyn->vector_sew = dyn->insts[ninst].vector_sew_entry; \
dyn->inst_sew = VECTOR_SEWNA; \
dyn->inst_vl = 0; \
if (box64_dynarec_dump) print_newinst(dyn, ninst); \
if (ninst) { \
addInst(dyn->instsize, &dyn->insts_size, dyn->insts[ninst - 1].x64.size, dyn->insts[ninst - 1].size / 4); \
Expand Down
2 changes: 2 additions & 0 deletions src/dynarec/rv64/dynarec_rv64_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ typedef struct dynarec_rv64_s {
uint8_t abort;
uint8_t vector_sew; // current sew status
uint8_t vector_eew; // current effective sew status, should only be used after SET_ELEMENT_WIDTH
uint8_t inst_sew; // sew inside current instruction, for vsetvli elimination
uint8_t inst_vl; // vl inside current instruction, for vsetvli elimination
} dynarec_rv64_t;

// v0 is hardware wired to vector mask register, which should be always reserved
Expand Down