RISC-V: Make rv32i_zcmp testcase more robust

GCC recently changed its register allocator which causes this
testcase to fail.
This patch updates the regex to be more robust to change by accepting
any s register in the range of 1-9 for cm.push and cm.popret insns.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/rv32i_zcmp.c: Accept any register in the
	range of 1-9 for cm.push and cm.popret insns.

Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>
(cherry picked from commit 68880e40533c41c89eb72247c3080703ad09270c)

diff --git a/gcc/testsuite/gcc.target/riscv/rv32i_zcmp.c b/gcc/testsuite/gcc.target/riscv/rv32i_zcmp.c
index ea562b7a233a33c2d183f3e634bf91bf8fb689fc..1e1a8be8705410b689eb1a80825f94ab8a1695f5 100644 (file)
--- a/gcc/testsuite/gcc.target/riscv/rv32i_zcmp.c
+++ b/gcc/testsuite/gcc.target/riscv/rv32i_zcmp.c
@@ -26,9 +26,9 @@ f2 (void);
 /*
 **test1:
 **     ...
-**     cm.push {ra, s0-s4}, -80
+**     cm.push {ra, s0-s[1-9]}, -80
 **     ...
-**     cm.popret       {ra, s0-s4}, 80
+**     cm.popret       {ra, s0-s[1-9]}, 80
 **     ...
 */
 int
@@ -50,9 +50,9 @@ test1 ()
 /*
 **test2_step1_0_size:
 **     ...
-**     cm.push {ra, s0-s1}, -64
+**     cm.push {ra, s0-s[1-9]}, -64
 **     ...
-**     cm.popret       {ra, s0-s1}, 64
+**     cm.popret       {ra, s0-s[1-9]}, 64
 **     ...
 */
 int
@@ -70,9 +70,9 @@ test2_step1_0_size ()
 /*
 **test3:
 **     ...
-**     cm.push {ra, s0-s4}, -80
+**     cm.push {ra, s0-s[1-9]}, -80
 **     ...
-**     cm.popret       {ra, s0-s4}, 80
+**     cm.popret       {ra, s0-s[1-9]}, 80
 **     ...
 */
 float