From f485b0ed7d06482d2f212ff0d9f5519a4f2c9a15 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Fri, 25 Feb 2022 17:01:34 +0100 Subject: [PATCH] [libgomp, testsuite, nvptx] Add -mptx=_ in declare-variant-3-sm*.c When running with target board unix/-foffload=-mptx=3.1, we run into: ... lto1: error: PTX version (-mptx) needs to be at least 4.2 to support \ selected -misa (sm_53)^M mkoffload: fatal error: x86_64-pc-linux-gnu-accel-nvptx-none-gcc returned \ 1 exit status^M compilation terminated.^M ... FAIL: libgomp.c/declare-variant-3-sm53.c (test for excess errors) ... Fix this by adding -foffload=-mptx=_ in the libgomp.c/declare-variant-3-sm*.c test-cases. Tested on x86_64 with nvptx accelerator. libgomp/ChangeLog: 2022-02-28 Tom de Vries * testsuite/libgomp.c/declare-variant-3-sm30.c: Add -foffload=-mptx=_. * testsuite/libgomp.c/declare-variant-3-sm35.c: Same. * testsuite/libgomp.c/declare-variant-3-sm53.c: Same. * testsuite/libgomp.c/declare-variant-3-sm70.c: Same. * testsuite/libgomp.c/declare-variant-3-sm75.c: Same. * testsuite/libgomp.c/declare-variant-3-sm80.c: Same. --- libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c index ad1602c..a49bc12 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c @@ -1,5 +1,5 @@ /* { dg-do run { target { offload_target_nvptx } } } */ -/* { dg-additional-options "-foffload=-misa=sm_30" } */ +/* { dg-additional-options "-foffload=-misa=sm_30 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ #include "declare-variant-3.h" diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c index 1a7cda2..9f71acb 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm35.c @@ -1,5 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ -/* { dg-additional-options "-foffload=-misa=sm_35" } */ +/* { dg-additional-options "-foffload=-misa=sm_35 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ #include "declare-variant-3.h" diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c index a37b5fd..fa71392 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm53.c @@ -1,5 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ -/* { dg-additional-options "-foffload=-misa=sm_53" } */ +/* { dg-additional-options "-foffload=-misa=sm_53 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ #include "declare-variant-3.h" diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c index ab022cd..90f0116 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm70.c @@ -1,5 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ -/* { dg-additional-options "-foffload=-misa=sm_70" } */ +/* { dg-additional-options "-foffload=-misa=sm_70 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ #include "declare-variant-3.h" diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c index 7d09195..86f2e72 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm75.c @@ -1,5 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ -/* { dg-additional-options "-foffload=-misa=sm_75" } */ +/* { dg-additional-options "-foffload=-misa=sm_75 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ #include "declare-variant-3.h" diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c index 898ae6e..de208d9 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm80.c @@ -1,5 +1,5 @@ /* { dg-do link { target { offload_target_nvptx } } } */ -/* { dg-additional-options "-foffload=-misa=sm_80" } */ +/* { dg-additional-options "-foffload=-misa=sm_80 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ #include "declare-variant-3.h" -- 2.7.4