From 6f45deb2aed804b185e7dabd2392bfbe14e9bb57 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 20 Jan 2022 23:48:03 -0500 Subject: [PATCH] [committed] Fix expected output for various MIPS multiplication tests The recent multiply-highpart work twiddled code generation on the MIPS targets and is causing mips.exp failures. The resultant code is actually better and matches a comment in the test files which indicates that it would be better to generate a mult-highpart. So I'm pretty confident in removing the undesired mflo & changing the name of the target pattern we expect to see. This fixes the mips64 and mips64el failures in my tester. I suspect it'll also fix the failures on mipsisa32, but that target is bootstrapped with qemu -- which takes forever so it only runs once a week ;-) gcc/testsuite * gcc.target/mips/fix-r4000-2.c: Update expected output. * gcc.target/mips/fix-r4000-3.c: Update expected output. Add -fexpensive-optimizations for consistency in output. * gcc.target/mips/fix-r4000-7.c: Update expected output. * gcc.target/mips/fix-r4000-8.c: Update expected output. --- gcc/testsuite/gcc.target/mips/fix-r4000-2.c | 4 +--- gcc/testsuite/gcc.target/mips/fix-r4000-3.c | 6 ++---- gcc/testsuite/gcc.target/mips/fix-r4000-7.c | 4 +--- gcc/testsuite/gcc.target/mips/fix-r4000-8.c | 6 ++---- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-2.c b/gcc/testsuite/gcc.target/mips/fix-r4000-2.c index 4290d5f..e0e65d6 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-2.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-2.c @@ -4,6 +4,4 @@ typedef int int32_t; typedef long long int64_t; NOMIPS16 int32_t foo (int32_t x, int32_t y) { return ((int64_t) x * y) >> 32; } -/* ??? A highpart pattern would be a better choice, but we currently - don't use them. */ -/* { dg-final { scan-assembler "[concat {\tmult\t\$[45],\$[45][^\n]+mulsidi3_32bit_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tmult\t\$[45],\$[45][^\n]+smulsi3_highpart_internal\n\tmfhi\t\$2\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-3.c b/gcc/testsuite/gcc.target/mips/fix-r4000-3.c index 5bc8fc8..ec9d655 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-3.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-3.c @@ -1,8 +1,6 @@ -/* { dg-options "-mips1 -mfix-r4000 -dp -EB" } */ +/* { dg-options "-mips1 -mfix-r4000 -dp -EB -fexpensive-optimizations" } */ /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */ typedef unsigned int uint32_t; typedef unsigned long long uint64_t; NOMIPS16 uint32_t foo (uint32_t x, uint32_t y) { return ((uint64_t) x * y) >> 32; } -/* ??? A highpart pattern would be a better choice, but we currently - don't use them. */ -/* { dg-final { scan-assembler "[concat {\tmultu\t\$[45],\$[45][^\n]+umulsidi3_32bit_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tmultu\t\$[45],\$[45][^\n]+umulsi3_highpart_internal\n\tmfhi\t\$2\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-7.c b/gcc/testsuite/gcc.target/mips/fix-r4000-7.c index 25178db..9b10577 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-7.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-7.c @@ -4,6 +4,4 @@ typedef long long int64_t; typedef int int128_t __attribute__((mode(TI))); NOMIPS16 int64_t foo (int64_t x, int64_t y) { return ((int128_t) x * y) >> 64; } -/* ??? A highpart pattern would be a better choice, but we currently - don't use them. */ -/* { dg-final { scan-assembler "[concat {\tdmult\t\$[45],\$[45][^\n]+mulditi3_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tdmult\t\$[45],\$[45][^\n]+smuldi3_highpart_internal\n\tmfhi\t\$2\n}]" } } */ diff --git a/gcc/testsuite/gcc.target/mips/fix-r4000-8.c b/gcc/testsuite/gcc.target/mips/fix-r4000-8.c index eae1488..1ce35df 100644 --- a/gcc/testsuite/gcc.target/mips/fix-r4000-8.c +++ b/gcc/testsuite/gcc.target/mips/fix-r4000-8.c @@ -1,8 +1,6 @@ -/* { dg-options "-march=r4000 -mfix-r4000 -mgp64 -dp -EB" } */ +/* { dg-options "-march=r4000 -mfix-r4000 -mgp64 -dp -EB -fexpensive-optimizations" } */ /* { dg-skip-if "code quality test" { *-*-* } { "-O0" } { "" } } */ typedef unsigned long long uint64_t; typedef unsigned int uint128_t __attribute__((mode(TI))); NOMIPS16 uint64_t foo (uint64_t x, uint64_t y) { return ((uint128_t) x * y) >> 64; } -/* ??? A highpart pattern would be a better choice, but we currently - don't use them. */ -/* { dg-final { scan-assembler "[concat {\tdmultu\t\$[45],\$[45][^\n]+umulditi3_r4000\n\tmflo\t\$3\n\tmfhi\t\$2\n}]" } } */ +/* { dg-final { scan-assembler "[concat {\tdmultu\t\$[45],\$[45][^\n]+umuldi3_highpart_internal\n\tmfhi\t\$2\n}]" } } */ -- 2.7.4