From e45537f56250f19cdf2ec09a744c6b11170c1001 Mon Sep 17 00:00:00 2001
From: Robin Dapp <rdapp@ventanamicro.com>
Date: Fri, 30 Aug 2024 14:35:08 +0200
Subject: [PATCH] RISC-V: Fix effective target check.
The return value is inverted in check_effective_target_rvv_zvl256b_ok
and check_effective_target_rvv_zvl512b_ok. Fix this and also just use
the current march.
gcc/testsuite/ChangeLog:
* lib/target-supports.exp: Fix effective target check.
---
gcc/testsuite/lib/target-supports.exp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 8f2afe866c7c..05a63c4e9a55 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1978,15 +1978,15 @@ proc check_effective_target_riscv_v { } {
proc check_effective_target_rvv_zvl256b_ok { } {
# Check if the target has a VLENB of 32.
- set gcc_march [regsub {[[:alnum:]]*} [riscv_get_arch] &v]
+ set gcc_march [riscv_get_arch]
return [check_runtime ${gcc_march}_exec {
int main()
{
int vlenb = 0;
asm ("csrr %0,vlenb" : "=r" (vlenb) : : );
if (vlenb == 32)
- return 1;
- return 0;
+ return 0;
+ return 1;
}
} "-march=${gcc_march}"]
}
@@ -1996,15 +1996,15 @@ proc check_effective_target_rvv_zvl256b_ok { } {
proc check_effective_target_rvv_zvl512b_ok { } {
# Check if the target has a VLENB of 64.
- set gcc_march [regsub {[[:alnum:]]*} [riscv_get_arch] &v]
+ set gcc_march [riscv_get_arch]
return [check_runtime ${gcc_march}_exec {
int main()
{
int vlenb = 0;
asm ("csrr %0,vlenb" : "=r" (vlenb) : : );
if (vlenb == 64)
- return 1;
- return 0;
+ return 0;
+ return 1;
}
} "-march=${gcc_march}"]
}
--
GitLab