This is an archive of the discontinued LLVM Phabricator instance.

Differential D105396

[RISCV] Remove Zvamo implication for v1.0-rc change
ClosedPublic

Authored by arcbbb on Jul 3 2021, 7:18 AM.
Tokens
"100" token, awarded by post.kadirselcuk.

Details

Reviewers
rogfer01
frasercrmck
jrtc27
craig.topper
evandro
HsiangKai
khchen
kito-cheng
Commits
rGf1cbea3e5275: [RISCV] Remove Zvamo implication for v1.0-rc change
rGe91440628e77: [IRBuilder] Avoid fetching pointer element type in some assertions
Summary

As v1.0-rc specs say Zvamo is removed from standard extension,
Zvamo has to be specified explicitly..

Diff Detail

Event Timeline

arcbbb created this revision.Jul 3 2021, 7:18 AM
Herald added subscribers: vkmr, dexonsmith, jdoerfert and 23 others. · View Herald TranscriptJul 3 2021, 7:18 AM
arcbbb requested review of this revision.Jul 3 2021, 7:18 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJul 3 2021, 7:18 AM
Herald added subscribers: llvm-commits, cfe-commits, MaskRay. · View Herald Transcript
• post.kadirselcuk accepted this revision.Jul 3 2021, 7:33 AM
• post.kadirselcuk added a subscriber: • post.kadirselcuk.
This revision is now accepted and ready to land.Jul 3 2021, 7:34 AM
• post.kadirselcuk requested changes to this revision.Jul 3 2021, 7:35 AM
This revision now requires changes to proceed.Jul 3 2021, 7:35 AM
• post.kadirselcuk accepted this revision.Jul 3 2021, 7:40 AM
• post.kadirselcuk added a parent revision: D105395: [IRBuilder] Add type argument to CreateMaskedLoad/Gather.
This revision is now accepted and ready to land.Jul 3 2021, 7:42 AM
• post.kadirselcuk requested changes to this revision.Jul 3 2021, 7:44 AM
• post.kadirselcuk added a child revision: D105380: [clang] fixes named return of variables with dependent alignment.
This revision now requires changes to proceed.Jul 3 2021, 7:45 AM
• post.kadirselcuk accepted this revision.Jul 3 2021, 7:46 AM
• post.kadirselcuk added a commit: rGe91440628e77: [IRBuilder] Avoid fetching pointer element type in some assertions.
This revision is now accepted and ready to land.Jul 3 2021, 7:47 AM
jrtc27 added a comment.Jul 3 2021, 8:04 AM

This is going to be a lot of churn. Why not just keep Zvamo0p10 as an experimental extension until a re-encoded version appears?

Harbormaster completed remote builds in B112325: Diff 356342.Jul 3 2021, 8:09 AM
• post.kadirselcuk added a commit: rG894c0c889707: [libc++] Fix CI on release/12.x branch.Jul 3 2021, 9:08 AM
• post.kadirselcuk removed a commit: rG894c0c889707: [libc++] Fix CI on release/12.x branch.Jul 3 2021, 9:12 AM
arcbbb updated this revision to Diff 356353.Jul 3 2021, 11:48 AM
arcbbb retitled this revision from [RISCV] Remove Zvamo extension for v1.0-rc change to [RISCV] Remove Zvamo implication for v1.0-rc change.
arcbbb edited the summary of this revision. (Show Details)

keep Zvamo0p10 and remove the implication only.

jrtc27 added inline comments.Jul 3 2021, 11:49 AM
clang/test/Preprocessor/riscv-target-features.c
239–246

ZVAMO

Harbormaster completed remote builds in B112335: Diff 356353.Jul 3 2021, 12:28 PM
arcbbb updated this revision to Diff 356369.Jul 3 2021, 11:40 PM

Fix FileCheck prefix: ZVAMO

Harbormaster completed remote builds in B112348: Diff 356369.Jul 4 2021, 1:26 AM
mehdi_amini removed a reviewer: • post.kadirselcuk.Jul 4 2021, 8:16 PM
This revision now requires review to proceed.Jul 4 2021, 8:16 PM
mizvekov removed a child revision: D105380: [clang] fixes named return of variables with dependent alignment.Jul 5 2021, 5:28 PM
evandro accepted this revision.Jul 6 2021, 7:12 AM
This revision is now accepted and ready to land.Jul 6 2021, 7:12 AM
Closed by commit rGf1cbea3e5275: [RISCV] Remove Zvamo implication for v1.0-rc change (authored by arcbbb). · Explain WhyJul 6 2021, 9:15 AM
This revision was automatically updated to reflect the committed changes.
arcbbb added a commit: rGf1cbea3e5275: [RISCV] Remove Zvamo implication for v1.0-rc change.
• post.kadirselcuk awarded a token.Jul 10 2021, 9:24 PM
arcbbb mentioned this in D111692: [RISCV] Remove Zvamo C intrinsics and builtins..Oct 13 2021, 1:19 PM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
Arch/
8 lines
test/
Preprocessor/
18 lines

Diff 356753

clang/lib/Driver/ToolChains/Arch/RISCV.cpp

Show First 20 Lines • Show All 252 Lines • ▼ Show 20 Lines for (auto Ext : AllExts) {
if (!isSupportedExtension(Ext)) { if (!isSupportedExtension(Ext)) {
StringRef Desc = getExtensionTypeDesc(getExtensionType(Ext)); StringRef Desc = getExtensionTypeDesc(getExtensionType(Ext));
std::string Error = "unsupported "; std::string Error = "unsupported ";
Error += Desc; Error += Desc;
D.Diag(diag::err_drv_invalid_riscv_ext_arch_name) D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
<< MArch << Error << Ext; << MArch << Error << Ext;
return; return;
} }
if (Ext == "zvamo" || Ext == "zvlsseg") { if (Ext == "zvlsseg") {
Features.push_back("+experimental-v");
Features.push_back("+experimental-zvlsseg");
} else if (Ext == "zvamo") {
Features.push_back("+experimental-v"); Features.push_back("+experimental-v");
Features.push_back("+experimental-zvamo");
Features.push_back("+experimental-zvlsseg"); Features.push_back("+experimental-zvlsseg");
Features.push_back("+experimental-zvamo");
} else if (isExperimentalExtension(Ext)) } else if (isExperimentalExtension(Ext))
Features.push_back(Args.MakeArgString("+experimental-" + Ext)); Features.push_back(Args.MakeArgString("+experimental-" + Ext));
else else
Features.push_back(Args.MakeArgString("+" + Ext)); Features.push_back(Args.MakeArgString("+" + Ext));
} }
} }
// Returns false if an error is diagnosed. // Returns false if an error is diagnosed.
▲ Show 20 Lines • Show All 151 Lines • ▼ Show 20 Lines case 'b':
Features.push_back("+experimental-zbm"); Features.push_back("+experimental-zbm");
Features.push_back("+experimental-zbp"); Features.push_back("+experimental-zbp");
Features.push_back("+experimental-zbr"); Features.push_back("+experimental-zbr");
Features.push_back("+experimental-zbs"); Features.push_back("+experimental-zbs");
Features.push_back("+experimental-zbt"); Features.push_back("+experimental-zbt");
break; break;
case 'v': case 'v':
Features.push_back("+experimental-v"); Features.push_back("+experimental-v");
Features.push_back("+experimental-zvamo");
Features.push_back("+experimental-zvlsseg"); Features.push_back("+experimental-zvlsseg");
break; break;
} }
// Consume full extension name and version, including any optional '_' // Consume full extension name and version, including any optional '_'
// between this extension and the next // between this extension and the next
++I; ++I;
I += Major.size(); I += Major.size();
▲ Show 20 Lines • Show All 285 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 219 Lines • ▼ Show 20 Lines
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32iv0p10 -x c -E -dM %s \ // RUN: -march=rv32iv0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv64iv0p10 -x c -E -dM %s \ // RUN: -march=rv64iv0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izvamo0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izvamo0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izvlsseg0p10 -x c -E -dM %s \ // RUN: -march=rv32izvlsseg0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izvlsseg0p10 -x c -E -dM %s \ // RUN: -march=rv32izvlsseg0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-V-EXT %s
// CHECK-V-EXT: __riscv_v 10000 // CHECK-V-EXT: __riscv_v 10000
// CHECK-V-EXT: __riscv_vector 1 // CHECK-V-EXT: __riscv_vector 1
// CHECK-V-EXT: __riscv_zvamo 10000
// CHECK-V-EXT: __riscv_zvlsseg 10000 // CHECK-V-EXT: __riscv_zvlsseg 10000
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izvamo0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZVAMO-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izvamo0p10 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZVAMO-EXT %s
// CHECK-ZVAMO-EXT: __riscv_v 10000
// CHECK-ZVAMO-EXT: __riscv_vector 1
// CHECK-ZVAMO-EXT: __riscv_zvamo 10000
// CHECK-ZVAMO-EXT: __riscv_zvlsseg 10000
jrtc27Unsubmitted
Not Done
ReplyInline Actions

ZVAMO

jrtc27: ZVAMO
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izfh0p1 -x c -E -dM %s \ // RUN: -march=rv32izfh0p1 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv64izfh0p1 -x c -E -dM %s \ // RUN: -march=rv64izfh0p1 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZFH-EXT %s
// CHECK-ZFH-EXT: __riscv_zfh 1000 // CHECK-ZFH-EXT: __riscv_zfh 1000