Skip to content

Commit 6cb71d7

Browse files
authored
[flang][NFC] Restrict -funroll-loops tests to known working targets (#124594)
If -funroll-loops tests are not restricted to specific targets the tests may behave differently based on the host platform. This patch restricts the tests to aarch64 and x86_64, and removes the PowerPC XFAIL.
1 parent ee1c6a6 commit 6cb71d7

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

flang/test/Integration/unroll-loops.f90

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
! RUN: %flang_fc1 -emit-llvm -O1 -funroll-loops -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,UNROLL
2-
! RUN: %flang_fc1 -emit-llvm -O2 -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,UNROLL
3-
! RUN: %flang_fc1 -emit-llvm -O1 -fno-unroll-loops -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,NO-UNROLL
4-
! RUN: %flang_fc1 -emit-llvm -O1 -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,NO-UNROLL
5-
61
! FIXME: https://github.com/llvm/llvm-project/issues/123668
7-
! XFAIL: target=powerpc64{{.*}}
8-
2+
!
3+
! DEFINE: %{triple} =
4+
! DEFINE: %{check-unroll} = %flang_fc1 -emit-llvm -O1 -funroll-loops -mllvm -force-vector-width=2 -triple %{triple} -o- %s | FileCheck %s --check-prefixes=CHECK,UNROLL
5+
! DEFINE: %{check-nounroll} = %flang_fc1 -emit-llvm -O1 -mllvm -force-vector-width=2 -triple %{triple} -o- %s | FileCheck %s --check-prefixes=CHECK,NO-UNROLL
6+
!
7+
! REDEFINE: %{triple} = aarch64-unknown-linux-gnu
8+
! RUN: %if aarch64-registered-target %{ %{check-unroll} %}
9+
! RUN: %if aarch64-registered-target %{ %{check-nounroll} %}
10+
!
11+
! REDEFINE: %{triple} = x86_64-unknown-linux-gnu
12+
! RUN: %if x86-registered-target %{ %{check-unroll} %}
13+
! RUN: %if x86-registered-target %{ %{check-nounroll} %}
14+
!
915
! CHECK-LABEL: @unroll
1016
! CHECK-SAME: (ptr nocapture writeonly %[[ARG0:.*]])
1117
subroutine unroll(a)

flang/test/HLFIR/unroll-loops.fir renamed to flang/test/Lower/HLFIR/unroll-loops.fir

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
// RUN: %flang_fc1 -emit-llvm -O1 -funroll-loops -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,UNROLL
2-
// RUN: %flang_fc1 -emit-llvm -O2 -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,UNROLL
3-
// RUN: %flang_fc1 -emit-llvm -O1 -fno-unroll-loops -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,NO-UNROLL
4-
// RUN: %flang_fc1 -emit-llvm -O1 -mllvm -force-vector-width=2 -o- %s | FileCheck %s --check-prefixes=CHECK,NO-UNROLL
1+
// DEFINE: %{triple} =
2+
// DEFINE: %{check-unroll} = %flang_fc1 -emit-llvm -O1 -funroll-loops -mllvm -force-vector-width=2 -triple %{triple} -o- %s | FileCheck %s --check-prefixes=CHECK,UNROLL
3+
// DEFINE: %{check-nounroll} = %flang_fc1 -emit-llvm -O1 -mllvm -force-vector-width=2 -triple %{triple} -o- %s | FileCheck %s --check-prefixes=CHECK,NO-UNROLL
54

6-
// FIXME: https://github.com/llvm/llvm-project/issues/123668
7-
// XFAIL: target=powerpc64{{.*}}
5+
// REDEFINE: %{triple} = aarch64-unknown-linux-gnu
6+
// RUN: %if aarch64-registered-target %{ %{check-unroll} %}
7+
// RUN: %if aarch64-registered-target %{ %{check-nounroll} %}
8+
9+
// REDEFINE: %{triple} = x86_64-unknown-linux-gnu
10+
// RUN: %if x86-registered-target %{ %{check-unroll} %}
11+
// RUN: %if x86-registered-target %{ %{check-nounroll} %}
812

913
// CHECK-LABEL: @unroll
1014
// CHECK-SAME: (ptr nocapture writeonly %[[ARG0:.*]])

0 commit comments

Comments
 (0)