Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 2c28b7a

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:aea06684992873f70c5834e2f455f913e5b8d671 into amd-gfx:617ef4684340
Local branch amd-gfx 617ef46 Merged main:4be1c19a9fbdff02044cd46b703c842bb7a6afdb into amd-gfx:8e51b74fa82f Remote branch main aea0668 [lldb][test] Use tools from llvm instead of compiler tools (llvm#109961)
2 parents 617ef46 + aea0668 commit 2c28b7a

File tree

27 files changed

+1730
-59
lines changed

27 files changed

+1730
-59
lines changed

‎clang/include/clang/Basic/arm_sve.td‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2418,6 +2418,16 @@ let SVETargetGuard = InvalidMode, SMETargetGuard = "sme2" in {
24182418
def SVUUNPK_X4 : SInst<"svunpk_{d}[_{3}_x4]", "42.h", "UsUiUl", MergeNone, "aarch64_sve_uunpk_x4", [IsStreaming], []>;
24192419
}
24202420

2421+
//
2422+
// Multi-vector scaling
2423+
//
2424+
let SVETargetGuard = InvalidMode, SMETargetGuard = "sme2,fp8" in {
2425+
def FSCALE_SINGLE_X2 : Inst<"svscale[_single_{d}_x2]", "22x", "fhd", MergeNone, "aarch64_sme_fp8_scale_single_x2", [IsStreaming],[]>;
2426+
def FSCALE_SINGLE_X4 : Inst<"svscale[_single_{d}_x4]", "44x", "fhd", MergeNone, "aarch64_sme_fp8_scale_single_x4", [IsStreaming],[]>;
2427+
def FSCALE_X2 : Inst<"svscale[_{d}_x2]", "222.x", "fhd", MergeNone, "aarch64_sme_fp8_scale_x2", [IsStreaming],[]>;
2428+
def FSCALE_X4 : Inst<"svscale[_{d}_x4]", "444.x", "fhd", MergeNone, "aarch64_sme_fp8_scale_x4", [IsStreaming],[]>;
2429+
}
2430+
24212431
let SVETargetGuard = "sve2p1", SMETargetGuard = "sme2" in {
24222432
// == BFloat16 multiply-subtract ==
24232433
def SVBFMLSLB : SInst<"svbfmlslb[_{d}]", "dd$$", "f", MergeNone, "aarch64_sve_bfmlslb", [IsOverloadNone, VerifyRuntimeMode], []>;

‎clang/lib/Driver/ToolChains/PS4CPU.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ toolchains::PS4PS5Base::PS4PS5Base(const Driver &D, const llvm::Triple &Triple,
338338
}
339339

340340
// Allow --sysroot= to override the root directory for header and library
341-
// search, and -sysroot to override header search. If both are specified,
341+
// search, and -isysroot to override header search. If both are specified,
342342
// -isysroot overrides --sysroot for header search.
343343
auto OverrideRoot = [&](const options::ID &Opt, std::string &Root,
344344
StringRef Default) {

‎clang/test/CodeGen/aarch64-fp8-intrinsics/acle_sme2_fp8_scale.c‎

Lines changed: 452 additions & 0 deletions
Large diffs are not rendered by default.

‎compiler-rt/lib/rtsan/rtsan.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
//
99
//===----------------------------------------------------------------------===//
1010

11-
#include <rtsan/rtsan.h>
12-
#include <rtsan/rtsan_assertions.h>
13-
#include <rtsan/rtsan_diagnostics.h>
14-
#include <rtsan/rtsan_flags.h>
15-
#include <rtsan/rtsan_interceptors.h>
11+
#include "rtsan/rtsan.h"
12+
#include "rtsan/rtsan_assertions.h"
13+
#include "rtsan/rtsan_diagnostics.h"
14+
#include "rtsan/rtsan_flags.h"
15+
#include "rtsan/rtsan_interceptors.h"
1616

1717
#include "sanitizer_common/sanitizer_atomic.h"
1818
#include "sanitizer_common/sanitizer_common.h"

‎compiler-rt/lib/rtsan/rtsan_context.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
//
99
//===----------------------------------------------------------------------===//
1010

11-
#include <rtsan/rtsan.h>
12-
#include <rtsan/rtsan_context.h>
11+
#include "rtsan/rtsan_context.h"
12+
#include "rtsan/rtsan.h"
1313

14-
#include <sanitizer_common/sanitizer_allocator_internal.h>
14+
#include "sanitizer_common/sanitizer_allocator_internal.h"
1515

1616
#include <new>
1717
#include <pthread.h>

‎compiler-rt/lib/rtsan/rtsan_context.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#pragma once
1212

13-
#include <sanitizer_common/sanitizer_internal_defs.h>
14-
1513
namespace __rtsan {
1614

1715
class Context {

‎compiler-rt/lib/rtsan/rtsan_preinit.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
//
99
//===----------------------------------------------------------------------===//
1010

11+
#include "rtsan/rtsan.h"
1112
#include "sanitizer_common/sanitizer_internal_defs.h"
12-
#include <rtsan/rtsan.h>
1313

1414
#if SANITIZER_CAN_USE_PREINIT_ARRAY
1515

‎compiler-rt/lib/rtsan/tests/rtsan_test_functional.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
#include "gtest/gtest.h"
1616

1717
#include "rtsan_test_utilities.h"
18-
#include <rtsan.h>
19-
#include <sanitizer_common/sanitizer_platform.h>
20-
#include <sanitizer_common/sanitizer_platform_interceptors.h>
18+
19+
#include "rtsan/rtsan.h"
20+
#include "sanitizer_common/sanitizer_platform.h"
21+
#include "sanitizer_common/sanitizer_platform_interceptors.h"
2122

2223
#include <array>
2324
#include <atomic>

‎compiler-rt/lib/rtsan/tests/rtsan_test_interceptors.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include "gtest/gtest.h"
1212

13-
#include <sanitizer_common/sanitizer_platform.h>
14-
#include <sanitizer_common/sanitizer_platform_interceptors.h>
13+
#include "sanitizer_common/sanitizer_platform.h"
14+
#include "sanitizer_common/sanitizer_platform_interceptors.h"
1515

1616
#include "rtsan_test_utilities.h"
1717

‎lld/test/COFF/Inputs/loadconfig-arm64ec.s‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ __os_arm64x_check_icall_cfg:
4242
.xword 0
4343
__os_arm64x_dispatch_fptr:
4444
.xword 0
45-
__os_arm64x_helper0:
46-
.xword 0
47-
__os_arm64x_helper1:
48-
.xword 0
49-
__os_arm64x_helper2:
50-
.xword 0
5145
__os_arm64x_helper3:
5246
.xword 0
5347
__os_arm64x_helper4:
@@ -65,7 +59,7 @@ __os_arm64x_helper8:
6559
.globl __chpe_metadata
6660
.p2align 3, 0
6761
__chpe_metadata:
68-
.word 1
62+
.word 2
6963
.rva __hybrid_code_map
7064
.word __hybrid_code_map_count
7165
.rva __x64_code_ranges_to_entry_points
@@ -85,9 +79,9 @@ __chpe_metadata:
8579
.word __arm64x_extra_rfe_table_size
8680
.rva __os_arm64x_dispatch_fptr
8781
.rva __hybrid_auxiliary_iat_copy
88-
.rva __os_arm64x_helper0
89-
.rva __os_arm64x_helper1
90-
.rva __os_arm64x_helper2
82+
.word 0 // __hybrid_auxiliary_delayload_iat
83+
.word 0 // __hybrid_auxiliary_delayload_iat_copy
84+
.word 0 // __hybrid_image_info_bitfield
9185
.rva __os_arm64x_helper3
9286
.rva __os_arm64x_helper4
9387
.rva __os_arm64x_helper5

0 commit comments

Comments
 (0)