Skip to content

Commit 7a55dca

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:9f406e450b6d into amd-gfx:7e7cb7e72c63
Local branch amd-gfx 7e7cb7e Merged main:077e1b892d95 into amd-gfx:1d4c3cc2fa8e Remote branch main 9f406e4 [HIP][Clang][Driver] Correctly specify test requirements as Linux + x86 + AMDGPU; temporarily retain targeted XFAILs for Hexagon & PS.
2 parents 7e7cb7e + 9f406e4 commit 7a55dca

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

clang/test/Driver/hipstdpar.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
// XFAIL: target={{.*}}-apple{{.*}}
1+
// REQUIRES: x86-registered-target
2+
// REQUIRES: amdgpu-registered-target
3+
// REQUIRES: system-linux
24
// XFAIL: target={{.*}}hexagon{{.*}}
35
// XFAIL: target={{.*}}-scei{{.*}}
46
// XFAIL: target={{.*}}-sie{{.*}}
5-
// XFAIL: target={{.*}}-windows{{.*}}
67

78
// RUN: not %clang -### --hipstdpar -nogpulib -nogpuinc --compile %s 2>&1 | \
89
// RUN: FileCheck --check-prefix=HIPSTDPAR-MISSING-LIB %s

lldb/test/API/functionalities/gdb_remote_client/TestPlatformAttach.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
class TestPlatformAttach(GDBRemoteTestBase):
99
@skipIfRemote
10-
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr52451")
1110
def test_attach(self):
1211
"""Test attaching by name"""
1312

llvm/include/llvm/Config/llvm-config.h.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/* Indicate that this is LLVM compiled from the amd-gfx branch. */
1818
#define LLVM_HAVE_BRANCH_AMD_GFX
19-
#define LLVM_MAIN_REVISION 476733
19+
#define LLVM_MAIN_REVISION 476743
2020

2121
/* Define if LLVM_ENABLE_DUMP is enabled */
2222
#cmakedefine LLVM_ENABLE_DUMP

0 commit comments

Comments
 (0)