[flang] Fix x86 REQUIRES in a couple of tests

[DavidSpickett]

Many tests in Flang are looking for x86_64-registered-target, but this never exists because the target is just called x86.

These two pass with this corrected but the others I need to look into why they fail.

[llvmbot]

@llvm/pr-subscribers-flang-semantics

Author: David Spickett (DavidSpickett)

Changes

Many tests in Flang are looking for x86_64-registered-target, but this never exists because the target is just called x86.

These two pass with this corrected but the others I need to look into why they fail.

---

Full diff: https://github.com/llvm/llvm-project/pull/146869.diff

2 Files Affected:

• (modified) flang/test/Lower/Intrinsics/ieee_class_queries.f90 (+1-1)
• (modified) flang/test/Semantics/windows.f90 (+1-1)

diff --git a/flang/test/Lower/Intrinsics/ieee_class_queries.f90 b/flang/test/Lower/Intrinsics/ieee_class_queries.f90
index aae8071b6a8b5..8d20ff8f3178f 100644
--- a/flang/test/Lower/Intrinsics/ieee_class_queries.f90
+++ b/flang/test/Lower/Intrinsics/ieee_class_queries.f90
@@ -1,5 +1,5 @@
 ! REQUIRES: flang-supports-f128-math
-! REQUIRES: x86_64-registered-target
+! REQUIRES: x86-registered-target
 ! RUN: bbc -target x86_64-unknown-linux-gnu -emit-fir -o - %s | FileCheck %s
 
   ! CHECK-LABEL: func @_QQmain
diff --git a/flang/test/Semantics/windows.f90 b/flang/test/Semantics/windows.f90
index 705fb1b816895..799a34e6b89c5 100644
--- a/flang/test/Semantics/windows.f90
+++ b/flang/test/Semantics/windows.f90
@@ -1,4 +1,4 @@
-! RUN: %if x86_64-registered-target %{ %python %S/test_errors.py %s %flang --target=x86_64-pc-windows-msvc -Werror %}
+! RUN: %if x86-registered-target %{ %python %S/test_errors.py %s %flang --target=x86_64-pc-windows-msvc -Werror %}
 ! RUN: %if aarch64-registered-target %{ %python %S/test_errors.py %s %flang --target=aarch64-pc-windows-msvc -Werror %}
 
 subroutine uid

[llvmbot]

@llvm/pr-subscribers-flang-fir-hlfir

Author: David Spickett (DavidSpickett)

Changes

Many tests in Flang are looking for x86_64-registered-target, but this never exists because the target is just called x86.

These two pass with this corrected but the others I need to look into why they fail.

---

Full diff: https://github.com/llvm/llvm-project/pull/146869.diff

2 Files Affected:

• (modified) flang/test/Lower/Intrinsics/ieee_class_queries.f90 (+1-1)
• (modified) flang/test/Semantics/windows.f90 (+1-1)

diff --git a/flang/test/Lower/Intrinsics/ieee_class_queries.f90 b/flang/test/Lower/Intrinsics/ieee_class_queries.f90
index aae8071b6a8b5..8d20ff8f3178f 100644
--- a/flang/test/Lower/Intrinsics/ieee_class_queries.f90
+++ b/flang/test/Lower/Intrinsics/ieee_class_queries.f90
@@ -1,5 +1,5 @@
 ! REQUIRES: flang-supports-f128-math
-! REQUIRES: x86_64-registered-target
+! REQUIRES: x86-registered-target
 ! RUN: bbc -target x86_64-unknown-linux-gnu -emit-fir -o - %s | FileCheck %s
 
   ! CHECK-LABEL: func @_QQmain
diff --git a/flang/test/Semantics/windows.f90 b/flang/test/Semantics/windows.f90
index 705fb1b816895..799a34e6b89c5 100644
--- a/flang/test/Semantics/windows.f90
+++ b/flang/test/Semantics/windows.f90
@@ -1,4 +1,4 @@
-! RUN: %if x86_64-registered-target %{ %python %S/test_errors.py %s %flang --target=x86_64-pc-windows-msvc -Werror %}
+! RUN: %if x86-registered-target %{ %python %S/test_errors.py %s %flang --target=x86_64-pc-windows-msvc -Werror %}
 ! RUN: %if aarch64-registered-target %{ %python %S/test_errors.py %s %flang --target=aarch64-pc-windows-msvc -Werror %}
 
 subroutine uid

[DavidSpickett]

From a print in the lit config:

aarch64
amdgpu
arm
avr
bpf
hexagon
lanai
loongarch
mips
msp430
nvptx
powerpc
riscv
sparc
spirv
systemz
ve
webassembly
x86
xcore

Note x86 not x86_64.

[dpaoliello]

LGTM