[tests] Specify the dependence to NVPTX backend for Polly ACC test cases

Some Polly ACC test cases fail without a working NVPTX backend. We explicitly
specify this dependence in REQUIRES. Alternatively, we could have only marked
polly-acc as supported in case the NVPTX backend is available, but as we might
use other backends in the future, this does not seem to be the best choice.

For this to work, we also need to make the 'targets_to_build' information
available.

Suggested-by: Michael Kruse <llvm@meinersbur.de>
llvm-svn: 296853

13 files changed, 16 insertions, 12 deletions

diff --git a/polly/test/GPGPU/double-parallel-loop.ll b/polly/test/GPGPU/double-parallel-loop.ll
index bfa12b6782a..b52d351fadb 100644
--- a/polly/test/GPGPU/double-parallel-loop.ll
+++ b/polly/test/GPGPU/double-parallel-loop.ll
@@ -18,7 +18,7 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck %s -check-prefix=KERNEL-ASM
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; CHECK: Stmt_bb5
 ; CHECK-NEXT:       Domain :=
diff --git a/polly/test/GPGPU/scalar-param-and-value-32-bit.ll b/polly/test/GPGPU/scalar-param-and-value-32-bit.ll
index ffc6e676ae0..7aabde083d9 100644
--- a/polly/test/GPGPU/scalar-param-and-value-32-bit.ll
+++ b/polly/test/GPGPU/scalar-param-and-value-32-bit.ll
@@ -2,7 +2,7 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck %s
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 ;
 ;    void foo(float A[], int n) {
 ;      for (long j = 0; j < n; j++)
diff --git a/polly/test/GPGPU/scalar-param-and-value-use.ll b/polly/test/GPGPU/scalar-param-and-value-use.ll
index 24576c922c9..6853fcf04d9 100644
--- a/polly/test/GPGPU/scalar-param-and-value-use.ll
+++ b/polly/test/GPGPU/scalar-param-and-value-use.ll
@@ -2,7 +2,7 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck -check-prefix=IR %s
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ;    void foo(long n, float A[][n]) {
 ;      for (long i = 0; i < 32; i++)
diff --git a/polly/test/GPGPU/scalar-parameter-fp128.ll b/polly/test/GPGPU/scalar-parameter-fp128.ll
index 0496a9902d7..d43de165dcd 100644
--- a/polly/test/GPGPU/scalar-parameter-fp128.ll
+++ b/polly/test/GPGPU/scalar-parameter-fp128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter-half.ll b/polly/test/GPGPU/scalar-parameter-half.ll
index 70ddadd1334..d55ae1adfb9 100644
--- a/polly/test/GPGPU/scalar-parameter-half.ll
+++ b/polly/test/GPGPU/scalar-parameter-half.ll
@@ -1,6 +1,6 @@
 ; RUN: opt %loadPolly -polly-codegen-ppcg -polly-acc-dump-code -disable-output %s
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "unexpected type" in the LLVM PTX backend.
 
diff --git a/polly/test/GPGPU/scalar-parameter-i120.ll b/polly/test/GPGPU/scalar-parameter-i120.ll
index 27e1d44f63a..087857a595c 100644
--- a/polly/test/GPGPU/scalar-parameter-i120.ll
+++ b/polly/test/GPGPU/scalar-parameter-i120.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter-i128.ll b/polly/test/GPGPU/scalar-parameter-i128.ll
index 9750abd6254..55c1273b453 100644
--- a/polly/test/GPGPU/scalar-parameter-i128.ll
+++ b/polly/test/GPGPU/scalar-parameter-i128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
diff --git a/polly/test/GPGPU/scalar-parameter-i3000.ll b/polly/test/GPGPU/scalar-parameter-i3000.ll
index 49c46a7ba4a..4203c2f8b0c 100644
--- a/polly/test/GPGPU/scalar-parameter-i3000.ll
+++ b/polly/test/GPGPU/scalar-parameter-i3000.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
diff --git a/polly/test/GPGPU/scalar-parameter-i80.ll b/polly/test/GPGPU/scalar-parameter-i80.ll
index 39b6d3c2365..b2f8f2c01e6 100644
--- a/polly/test/GPGPU/scalar-parameter-i80.ll
+++ b/polly/test/GPGPU/scalar-parameter-i80.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
diff --git a/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll b/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
index 66a65b23e78..6290b183069 100644
--- a/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
+++ b/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter-x86_fp80.ll b/polly/test/GPGPU/scalar-parameter-x86_fp80.ll
index 0496a9902d7..d43de165dcd 100644
--- a/polly/test/GPGPU/scalar-parameter-x86_fp80.ll
+++ b/polly/test/GPGPU/scalar-parameter-x86_fp80.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter.ll b/polly/test/GPGPU/scalar-parameter.ll
index c361f97152f..73a51e889e3 100644
--- a/polly/test/GPGPU/scalar-parameter.ll
+++ b/polly/test/GPGPU/scalar-parameter.ll
@@ -10,7 +10,7 @@
 ; RUN: -disable-output -polly-acc-dump-kernel-ir < %s | \
 ; RUN: FileCheck -check-prefix=KERNEL %s
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
diff --git a/polly/test/lit.site.cfg.in b/polly/test/lit.site.cfg.in
index 0132268bd30..71ec8ef46c3 100644
--- a/polly/test/lit.site.cfg.in
+++ b/polly/test/lit.site.cfg.in
@@ -9,6 +9,7 @@ config.polly_lib_dir = "@POLLY_LIB_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.enable_gpgpu_codegen = "@GPU_CODEGEN@"
 config.link_polly_into_tools = "@LINK_POLLY_INTO_TOOLS@"
+config.targets_to_build = "@TARGETS_TO_BUILD@"
 
 ## Check the current platform with regex
 import re
@@ -16,6 +17,9 @@ EAT_ERR_ON_X86 = ' '
 if (re.match(r'^x86_64*', '@TARGET_TRIPLE@') == None) :
   EAT_ERR_ON_X86 = '|| echo \"error is eaten\"'
 
+for arch in config.targets_to_build.split():
+    config.available_features.add(arch.lower() + '-registered-target')
+
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
 try: