Skip to content

Commit 95da403

Browse files
TieTie
authored andcommitted
Add Ziccamoc 2.0
1 parent e98bead commit 95da403

File tree

5 files changed

+5
-2
lines changed

5 files changed

+5
-2
lines changed

clang/test/Driver/print-supported-extensions-riscv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// CHECK-NEXT: zicbop 1.0 'Zicbop' (Cache-Block Prefetch Instructions)
2020
// CHECK-NEXT: zicboz 1.0 'Zicboz' (Cache-Block Zero Instructions)
2121
// CHECK-NEXT: ziccamoa 1.0 'Ziccamoa' (Main Memory Supports All Atomics in A)
22+
// CHECK-NEXT: ziccamoc 1.0 'Ziccamoc' (Main Memory Supports Atomics in Zacas)
2223
// CHECK-NEXT: ziccif 1.0 'Ziccif' (Main Memory Supports Instruction Fetch with Atomicity Requirement)
2324
// CHECK-NEXT: zicclsm 1.0 'Zicclsm' (Main Memory Supports Misaligned Loads/Stores)
2425
// CHECK-NEXT: ziccrse 1.0 'Ziccrse' (Main Memory Supports Forward Progress on LR/SC Sequences)

clang/test/Preprocessor/riscv-target-features.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,6 @@
10511051
// RUN: %clang --target=riscv32-unknown-linux-gnu \
10521052
// RUN: -march=rv32iziccamoc -E -dM %s \
10531053
// RUN: -o - | FileCheck --check-prefix=CHECK-ZICCAMOC-EXT %s
1054-
// CHECK-ZICCAMOC-EXT: __riscv_ziccamoc 1000000{{$}}
10551054
// RUN: %clang --target=riscv64-unknown-linux-gnu \
10561055
// RUN: -march=rv64iziccamoc -E -dM %s \
10571056
// RUN: -o - | FileCheck --check-prefix=CHECK-ZICCAMOC-EXT %s

llvm/docs/ReleaseNotes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,11 @@ Changes to the RISC-V Backend
167167
* Adds assembler support for ``.option exact``, which disables automatic compression,
168168
and branch and linker relaxation. This can be disabled with ``.option noexact``,
169169
which is also the default.
170+
<<<<<<< HEAD
170171
* `-mcpu=xiangshan-kunminghu` was added.
171172
* `-mcpu=andes-n45` and `-mcpu=andes-nx45` were added.
172173
* `-mcpu=andes-a45` and `-mcpu=andes-ax45` were added.
174+
* Adds support for the 'Ziccamoc` (Main Memory Supports Atomics in Zacas) extension, which was introduced as an optional extension of the RISC-V Profiles specification.
173175

174176
Changes to the WebAssembly Backend
175177
----------------------------------

llvm/lib/Target/RISCV/RISCVFeatures.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def FeatureStdExtZiccamoa
103103
: RISCVExtension<1, 0, "Main Memory Supports All Atomics in A">;
104104

105105
def FeatureStdExtZiccamoc
106-
: RISCVExtension<1, 0, "Main memory supports atomics in Zacas">;
106+
: RISCVExtension<1, 0, "Main Memory Supports Atomics in Zacas">;
107107

108108
def FeatureStdExtZiccif
109109
: RISCVExtension<1, 0,

llvm/test/CodeGen/RISCV/features-info.ll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
; CHECK-NEXT: zicbop - 'Zicbop' (Cache-Block Prefetch Instructions).
238238
; CHECK-NEXT: zicboz - 'Zicboz' (Cache-Block Zero Instructions).
239239
; CHECK-NEXT: ziccamoa - 'Ziccamoa' (Main Memory Supports All Atomics in A).
240+
; CHECK-NEXT: ziccamoc - 'Ziccamoc' (Main Memory Supports Atomics in Zacas).
240241
; CHECK-NEXT: ziccif - 'Ziccif' (Main Memory Supports Instruction Fetch with Atomicity Requirement).
241242
; CHECK-NEXT: zicclsm - 'Zicclsm' (Main Memory Supports Misaligned Loads/Stores).
242243
; CHECK-NEXT: ziccrse - 'Ziccrse' (Main Memory Supports Forward Progress on LR/SC Sequences).

0 commit comments

Comments
 (0)