This is an archive of the discontinued LLVM Phabricator instance.

Differential D95590

[RISCV] Define preprocessor definitions for 'P' extension
Needs ReviewPublic

Authored by Jim on Jan 27 2021, 9:40 PM.

Details

Reviewers
craig.topper
HsiangKai
kito-cheng
jrtc27
luismarques

Diff Detail

Unit TestsFailed

TimeTest
1,600 msx64 debian > Clang.Preprocessor::riscv-target-features.c
9,090 msx64 windows > Clang.Preprocessor::riscv-target-features.c

Event Timeline

Jim created this revision.Jan 27 2021, 9:40 PM
Herald added subscribers: frasercrmck, NickHung, evandro and 21 others. · View Herald TranscriptJan 27 2021, 9:40 PM
Jim requested review of this revision.Jan 27 2021, 9:40 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 27 2021, 9:40 PM
Herald added subscribers: cfe-commits, MaskRay. · View Herald Transcript
Harbormaster completed remote builds in B86962: Diff 319760.Jan 27 2021, 10:19 PM
Jim mentioned this in D95588: [RISCV] Implement the MC layer support of P extension.Apr 5 2021, 11:54 PM
Jim abandoned this revision.Apr 6 2021, 12:22 AM

Merge this patch into https://reviews.llvm.org/D95588

Herald added a subscriber: vkmr. · View Herald TranscriptApr 6 2021, 12:22 AM
Jim updated this revision to Diff 361087.Jul 22 2021, 11:01 PM

Recover it. Split preprocessor definitions part of D95588 to this.

Harbormaster completed remote builds in B115775: Diff 361087.Jul 22 2021, 11:35 PM
Jim updated this revision to Diff 363371.Aug 1 2021, 9:12 PM

Rebase

Harbormaster completed remote builds in B117376: Diff 363371.Aug 1 2021, 9:55 PM
Jim updated this revision to Diff 365358.Aug 9 2021, 10:44 PM

Rebase

Harbormaster completed remote builds in B118810: Diff 365358.Aug 9 2021, 11:24 PM

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
4 lines
24 lines
test/
Preprocessor/
40 lines

Diff 365358

clang/lib/Basic/Targets/RISCV.h

Show All 25 Lines
protected: protected:
std::string ABI, CPU; std::string ABI, CPU;
bool HasM = false; bool HasM = false;
bool HasA = false; bool HasA = false;
bool HasF = false; bool HasF = false;
bool HasD = false; bool HasD = false;
bool HasC = false; bool HasC = false;
bool HasB = false; bool HasB = false;
bool HasP = false;
bool HasV = false; bool HasV = false;
bool HasZba = false; bool HasZba = false;
bool HasZbb = false; bool HasZbb = false;
bool HasZbc = false; bool HasZbc = false;
bool HasZbe = false; bool HasZbe = false;
bool HasZbf = false; bool HasZbf = false;
bool HasZbm = false; bool HasZbm = false;
bool HasZbp = false; bool HasZbp = false;
bool HasZbproposedc = false; bool HasZbproposedc = false;
bool HasZbr = false; bool HasZbr = false;
bool HasZbs = false; bool HasZbs = false;
bool HasZbt = false; bool HasZbt = false;
bool HasZpn = false;
bool HasZpsfoperand = false;
bool HasZprvsfextra = false;
bool HasZfh = false; bool HasZfh = false;
bool HasZvamo = false; bool HasZvamo = false;
bool HasZvlsseg = false; bool HasZvlsseg = false;
static const Builtin::Info BuiltinInfo[]; static const Builtin::Info BuiltinInfo[];
public: public:
RISCVTargetInfo(const llvm::Triple &Triple, const TargetOptions &) RISCVTargetInfo(const llvm::Triple &Triple, const TargetOptions &)
▲ Show 20 Lines • Show All 124 Lines • Show Last 20 Lines

clang/lib/Basic/Targets/RISCV.cpp

Show First 20 Lines • Show All 175 Lines • ▼ Show 20 Lines if (HasC) {
Builder.defineMacro("__riscv_compressed"); Builder.defineMacro("__riscv_compressed");
} }
if (HasB) { if (HasB) {
Builder.defineMacro("__riscv_b", "93000"); Builder.defineMacro("__riscv_b", "93000");
Builder.defineMacro("__riscv_bitmanip"); Builder.defineMacro("__riscv_bitmanip");
} }
if (HasP)
Builder.defineMacro("__riscv_p", "93000");
if (HasV) { if (HasV) {
Builder.defineMacro("__riscv_v", "10000"); Builder.defineMacro("__riscv_v", "10000");
Builder.defineMacro("__riscv_vector"); Builder.defineMacro("__riscv_vector");
} }
if (HasZba) if (HasZba)
Builder.defineMacro("__riscv_zba", "93000"); Builder.defineMacro("__riscv_zba", "93000");
Show All 22 Lines if (HasZbr)
Builder.defineMacro("__riscv_zbr", "93000"); Builder.defineMacro("__riscv_zbr", "93000");
if (HasZbs) if (HasZbs)
Builder.defineMacro("__riscv_zbs", "93000"); Builder.defineMacro("__riscv_zbs", "93000");
if (HasZbt) if (HasZbt)
Builder.defineMacro("__riscv_zbt", "93000"); Builder.defineMacro("__riscv_zbt", "93000");
if (HasZpn)
Builder.defineMacro("__riscv_zpn", "93000");
if (HasZpsfoperand)
Builder.defineMacro("__riscv_zpsfoperand", "93000");
if (HasZprvsfextra)
Builder.defineMacro("__riscv_zprvsfextra", "93000");
if (HasZfh) if (HasZfh)
Builder.defineMacro("__riscv_zfh", "1000"); Builder.defineMacro("__riscv_zfh", "1000");
if (HasZvamo) if (HasZvamo)
Builder.defineMacro("__riscv_zvamo", "10000"); Builder.defineMacro("__riscv_zvamo", "10000");
if (HasZvlsseg) if (HasZvlsseg)
Builder.defineMacro("__riscv_zvlsseg", "10000"); Builder.defineMacro("__riscv_zvlsseg", "10000");
Show All 31 Lines return llvm::StringSwitch<bool>(Feature)
.Case("riscv64", Is64Bit) .Case("riscv64", Is64Bit)
.Case("64bit", Is64Bit) .Case("64bit", Is64Bit)
.Case("m", HasM) .Case("m", HasM)
.Case("a", HasA) .Case("a", HasA)
.Case("f", HasF) .Case("f", HasF)
.Case("d", HasD) .Case("d", HasD)
.Case("c", HasC) .Case("c", HasC)
.Case("experimental-b", HasB) .Case("experimental-b", HasB)
.Case("experimental-p", HasP)
.Case("experimental-v", HasV) .Case("experimental-v", HasV)
.Case("experimental-zba", HasZba) .Case("experimental-zba", HasZba)
.Case("experimental-zbb", HasZbb) .Case("experimental-zbb", HasZbb)
.Case("experimental-zbc", HasZbc) .Case("experimental-zbc", HasZbc)
.Case("experimental-zbe", HasZbe) .Case("experimental-zbe", HasZbe)
.Case("experimental-zbf", HasZbf) .Case("experimental-zbf", HasZbf)
.Case("experimental-zbm", HasZbm) .Case("experimental-zbm", HasZbm)
.Case("experimental-zbp", HasZbp) .Case("experimental-zbp", HasZbp)
.Case("experimental-zbproposedc", HasZbproposedc) .Case("experimental-zbproposedc", HasZbproposedc)
.Case("experimental-zbr", HasZbr) .Case("experimental-zbr", HasZbr)
.Case("experimental-zbs", HasZbs) .Case("experimental-zbs", HasZbs)
.Case("experimental-zbt", HasZbt) .Case("experimental-zbt", HasZbt)
.Case("experimental-zpn", HasZpn)
.Case("experimental-zpsfoperand", HasZpsfoperand)
.Case("experimental-zprvsfextra", HasZprvsfextra)
.Case("experimental-zfh", HasZfh) .Case("experimental-zfh", HasZfh)
.Case("experimental-zvamo", HasZvamo) .Case("experimental-zvamo", HasZvamo)
.Case("experimental-zvlsseg", HasZvlsseg) .Case("experimental-zvlsseg", HasZvlsseg)
.Default(false); .Default(false);
} }
/// Perform initialization based on the user configured set of features. /// Perform initialization based on the user configured set of features.
bool RISCVTargetInfo::handleTargetFeatures(std::vector<std::string> &Features, bool RISCVTargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
DiagnosticsEngine &Diags) { DiagnosticsEngine &Diags) {
for (const auto &Feature : Features) { for (const auto &Feature : Features) {
if (Feature == "+m") if (Feature == "+m")
HasM = true; HasM = true;
else if (Feature == "+a") else if (Feature == "+a")
HasA = true; HasA = true;
else if (Feature == "+f") else if (Feature == "+f")
HasF = true; HasF = true;
else if (Feature == "+d") else if (Feature == "+d")
HasD = true; HasD = true;
else if (Feature == "+c") else if (Feature == "+c")
HasC = true; HasC = true;
else if (Feature == "+experimental-b") else if (Feature == "+experimental-b")
HasB = true; HasB = true;
else if (Feature == "+experimental-p")
HasP = true;
else if (Feature == "+experimental-v") else if (Feature == "+experimental-v")
HasV = true; HasV = true;
else if (Feature == "+experimental-zba") else if (Feature == "+experimental-zba")
HasZba = true; HasZba = true;
else if (Feature == "+experimental-zbb") else if (Feature == "+experimental-zbb")
HasZbb = true; HasZbb = true;
else if (Feature == "+experimental-zbc") else if (Feature == "+experimental-zbc")
HasZbc = true; HasZbc = true;
else if (Feature == "+experimental-zbe") else if (Feature == "+experimental-zbe")
HasZbe = true; HasZbe = true;
else if (Feature == "+experimental-zbf") else if (Feature == "+experimental-zbf")
HasZbf = true; HasZbf = true;
else if (Feature == "+experimental-zbm") else if (Feature == "+experimental-zbm")
HasZbm = true; HasZbm = true;
else if (Feature == "+experimental-zbp") else if (Feature == "+experimental-zbp")
HasZbp = true; HasZbp = true;
else if (Feature == "+experimental-zbproposedc") else if (Feature == "+experimental-zbproposedc")
HasZbproposedc = true; HasZbproposedc = true;
else if (Feature == "+experimental-zbr") else if (Feature == "+experimental-zbr")
HasZbr = true; HasZbr = true;
else if (Feature == "+experimental-zbs") else if (Feature == "+experimental-zbs")
HasZbs = true; HasZbs = true;
else if (Feature == "+experimental-zbt") else if (Feature == "+experimental-zbt")
HasZbt = true; HasZbt = true;
else if (Feature == "+experimental-zpn")
HasZpn = true;
else if (Feature == "+experimental-zpsfoperand")
HasZpsfoperand = true;
else if (Feature == "+experimental-zprvsfextra")
HasZprvsfextra = true;
else if (Feature == "+experimental-zfh") else if (Feature == "+experimental-zfh")
HasZfh = true; HasZfh = true;
else if (Feature == "+experimental-zvamo") else if (Feature == "+experimental-zvamo")
HasZvamo = true; HasZvamo = true;
else if (Feature == "+experimental-zvlsseg") else if (Feature == "+experimental-zvlsseg")
HasZvlsseg = true; HasZvlsseg = true;
} }
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines
// RUN: -o - | FileCheck --check-prefix=CHECK-ZBT-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZBT-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv64izbt0p93 -x c -E -dM %s \ // RUN: -march=rv64izbt0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZBT-EXT %s // RUN: -o - | FileCheck --check-prefix=CHECK-ZBT-EXT %s
// CHECK-ZBT-NOT: __riscv_b // CHECK-ZBT-NOT: __riscv_b
// CHECK-ZBT-EXT: __riscv_zbt 93000 // CHECK-ZBT-EXT: __riscv_zbt 93000
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \ // RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32ip0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-32P-EXT %s
// CHECK-32P-EXT: __riscv_p 93000
// CHECK-32P-EXT: __riscv_zpn 93000
// CHECK-32P-EXT: __riscv_zpsfoperand 93000
// CHECK-32P-NOT: __riscv_zprvsfextra
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv64ip0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-64P-EXT %s
// CHECK-64P-EXT: __riscv_p 93000
// CHECK-64P-EXT: __riscv_zpn 93000
// CHECK-64P-EXT: __riscv_zprvsfextra 93000
// CHECK-64P-EXT: __riscv_zpsfoperand 93000
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izpn0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZPN-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv64izpn0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZPN-EXT %s
// CHECK-ZPN-NOT: __riscv_p
// CHECK-ZPN-EXT: __riscv_zpn 93000
// RUN: %clang -target riscv32-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv32izpsfoperand0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZPSFOPERAND-EXT %s
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv64izpsfoperand0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZPSFOPERAND-EXT %s
// CHECK-ZPSFOPERAND-NOT: __riscv_p
// CHECK-ZPSFOPERAND-EXT: __riscv_zpsfoperand 93000
// RUN: %clang -target riscv64-unknown-linux-gnu -menable-experimental-extensions \
// RUN: -march=rv64izprvsfextra0p93 -x c -E -dM %s \
// RUN: -o - | FileCheck --check-prefix=CHECK-ZPRVSFEXTRA-EXT %s
// CHECK-ZPRVSFEXTRA-NOT: __riscv_p
// CHECK-ZPRVSFEXTRA-EXT: __riscv_zprvsfextra 93000
// 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=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
Show All 25 Lines