diff options
| author | Juzhe-Zhong <juzhe.zhong@rivai.ai> | 2023-09-18 19:08:25 +0800 |
|---|---|---|
| committer | Pan Li <pan2.li@intel.com> | 2023-09-18 19:11:40 +0800 |
| commit | 8fbc0871da26fac1668ba939f4492876794734ac (patch) | |
| tree | 2c01c1e0dc6a00bfc7630f3546f106a13d142c03 /gcc | |
| parent | 79b34b954399287521793f77437f509299976373 (diff) | |
| download | gcc-8fbc0871da26fac1668ba939f4492876794734ac.zip gcc-8fbc0871da26fac1668ba939f4492876794734ac.tar.gz gcc-8fbc0871da26fac1668ba939f4492876794734ac.tar.bz2 | |
RISC-V: Fix VSETVL PASS fusion bug
There is an obvious fusion bug that is exposed by more VLS patterns support.
After more VLS modes support, it cause following FAILs:
FAIL: gcc.target/riscv/rvv/autovec/reduc/reduc_run-2.c execution test
FAIL: gcc.target/riscv/rvv/autovec/reduc/reduc_run-2.c execution test
FAIL: gcc.target/riscv/rvv/autovec/reduc/reduc_run-2.c execution test
FAIL: gcc.target/riscv/rvv/autovec/reduc/reduc_run-2.c execution test
Demand 1: SEW = 64, LMUL = 1, RATIO = 64, demand SEW, demand GE_SEW.
Demand 2: SEW = 64, LMUL = 2, RATIO = 32, demand SEW, demand GE_SEW, demand RATIO.
Before this patch:
merge demand: SEW = 64, LMUL = 1, RATIO = 32, demand SEW, demand LMUL, demand GE_SEW.
It's obvious incorrect of merge LMUL which should be new LMUL = (demand 2 RATIO * greatest SEW) = M2
gcc/ChangeLog:
* config/riscv/riscv-vsetvl.cc (vlmul_for_greatest_sew_second_ratio): New function.
* config/riscv/riscv-vsetvl.def (DEF_SEW_LMUL_FUSE_RULE): Fix bug.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/riscv/riscv-vsetvl.cc | 8 | ||||
| -rw-r--r-- | gcc/config/riscv/riscv-vsetvl.def | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index 5f031c1..df980b6 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -1308,6 +1308,14 @@ vlmul_for_first_sew_second_ratio (const vector_insn_info &info1, return calculate_vlmul (info1.get_sew (), info2.get_ratio ()); } +static vlmul_type +vlmul_for_greatest_sew_second_ratio (const vector_insn_info &info1, + const vector_insn_info &info2) +{ + return calculate_vlmul (MAX (info1.get_sew (), info2.get_sew ()), + info2.get_ratio ()); +} + static unsigned ratio_for_second_sew_first_vlmul (const vector_insn_info &info1, const vector_insn_info &info2) diff --git a/gcc/config/riscv/riscv-vsetvl.def b/gcc/config/riscv/riscv-vsetvl.def index 7289c01..709cc4e 100644 --- a/gcc/config/riscv/riscv-vsetvl.def +++ b/gcc/config/riscv/riscv-vsetvl.def @@ -329,8 +329,8 @@ DEF_SEW_LMUL_FUSE_RULE (/*SEW*/ DEMAND_TRUE, /*LMUL*/ DEMAND_FALSE, /*NEW_DEMAND_SEW*/ true, /*NEW_DEMAND_LMUL*/ false, /*NEW_DEMAND_RATIO*/ true, - /*NEW_DEMAND_GE_SEW*/ true, greatest_sew, first_vlmul, - second_ratio) + /*NEW_DEMAND_GE_SEW*/ true, greatest_sew, + vlmul_for_greatest_sew_second_ratio, second_ratio) DEF_SEW_LMUL_FUSE_RULE (/*SEW*/ DEMAND_TRUE, /*LMUL*/ DEMAND_FALSE, /*RATIO*/ DEMAND_ANY, /*GE_SEW*/ DEMAND_TRUE, /*SEW*/ DEMAND_FALSE, /*LMUL*/ DEMAND_TRUE, |