tests/tcg: Replace -mpower8-vector with -mvsx

[PATCH] tests/tcg: Replace -mpower8-vector with -mvsx

Posted by Ilya Leoshkevich 1 day, 6 hours ago

[1] deprecated -mpower8-vector, resulting in:

    powerpc64-linux-gnu-gcc: warning: switch '-mpower8-vector' is no longer supported
    qemu/tests/tcg/ppc64/vsx_f2i_nan.c:4:15: error: expected ';' before 'float'
        4 | typedef vector float vsx_float32_vec_t;
          |               ^~~~~~

Similar to how this was done for the GCC testcases, replace
-mpower8-vector with -mvsx.

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109987

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
 tests/tcg/ppc64/Makefile.target | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target
index 1940886c737..d1b00d2bf09 100644
--- a/tests/tcg/ppc64/Makefile.target
+++ b/tests/tcg/ppc64/Makefile.target
@@ -6,7 +6,7 @@ VPATH += $(SRC_PATH)/tests/tcg/ppc64
 
 config-cc.mak: Makefile
 	$(quiet-@)( \
-	    $(call cc-option,-mpower8-vector,   CROSS_CC_HAS_POWER8_VECTOR); \
+	    $(call cc-option,-mvsx,             CROSS_CC_HAS_VSX); \
 	    $(call cc-option,-mpower10,         CROSS_CC_HAS_POWER10)) 3> config-cc.mak
 
 -include config-cc.mak
@@ -23,15 +23,15 @@ run-threadcount: threadcount
 run-plugin-threadcount-with-%:
 	$(call skip-test, $<, "BROKEN (flaky with clang) ")
 
-ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),)
+ifneq ($(CROSS_CC_HAS_VSX),)
 PPC64_TESTS=bcdsub non_signalling_xscv
 endif
-$(PPC64_TESTS): CFLAGS += -mpower8-vector
+$(PPC64_TESTS): CFLAGS += -mvsx
 
-ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),)
+ifneq ($(CROSS_CC_HAS_VSX),)
 PPC64_TESTS += vsx_f2i_nan
 endif
-vsx_f2i_nan: CFLAGS += -mpower8-vector -I$(SRC_PATH)/include
+vsx_f2i_nan: CFLAGS += -mvsx -I$(SRC_PATH)/include
 
 PPC64_TESTS += mtfsf
 PPC64_TESTS += mffsce
-- 
2.47.0

Re: [PATCH] tests/tcg: Replace -mpower8-vector with -mvsx

Posted by Richard Henderson 17 hours ago

On 10/21/24 07:27, Ilya Leoshkevich wrote:
> [1] deprecated -mpower8-vector, resulting in:
> 
>      powerpc64-linux-gnu-gcc: warning: switch '-mpower8-vector' is no longer supported
>      qemu/tests/tcg/ppc64/vsx_f2i_nan.c:4:15: error: expected ';' before 'float'
>          4 | typedef vector float vsx_float32_vec_t;
>            |               ^~~~~~
> 
> Similar to how this was done for the GCC testcases, replace
> -mpower8-vector with -mvsx.
> 
> [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109987
> 
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
>   tests/tcg/ppc64/Makefile.target | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target
> index 1940886c737..d1b00d2bf09 100644
> --- a/tests/tcg/ppc64/Makefile.target
> +++ b/tests/tcg/ppc64/Makefile.target
> @@ -6,7 +6,7 @@ VPATH += $(SRC_PATH)/tests/tcg/ppc64
>   
>   config-cc.mak: Makefile
>   	$(quiet-@)( \
> -	    $(call cc-option,-mpower8-vector,   CROSS_CC_HAS_POWER8_VECTOR); \
> +	    $(call cc-option,-mvsx,             CROSS_CC_HAS_VSX); \
>   	    $(call cc-option,-mpower10,         CROSS_CC_HAS_POWER10)) 3> config-cc.mak

I don't think this is quite right.
I think you need -mpower8 to get OPTION_MASK_P8_VECTOR set.

> +ifneq ($(CROSS_CC_HAS_VSX),)
>   PPC64_TESTS=bcdsub non_signalling_xscv

bcdsub is not in the base VSX instruction set, for instance.


r~