This is an archive of the discontinued LLVM Phabricator instance.

Differential D138930

[RISCV] Add macro to imply compiler availability on RISC-V Vector intrinsics version
ClosedPublic

Authored by eopXD on Nov 29 2022, 8:39 AM.

Details

Reviewers
craig.topper
kito-cheng
jrtc27
reames
asb
Commits
rG482b8b493be0: [RISCV] Add macro to imply compiler availability on RISC-V Vector intrinsics…
Summary

According to version_macro.adoc under rvv-intrinsic-doc, the compiler
should have a macro to imply such availability.

Link: https://github.com/riscv-non-isa/rvv-intrinsic-doc/blob/master/version_macro.adoc

Diff Detail

Event Timeline

eopXD created this revision.Nov 29 2022, 8:39 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 29 2022, 8:39 AM
Herald added subscribers: sunshaoce, VincentWu, StephenFan and 25 others. · View Herald Transcript
eopXD requested review of this revision.Nov 29 2022, 8:39 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 29 2022, 8:39 AM
Herald added subscribers: cfe-commits, • pcwang-thead, MaskRay. · View Herald Transcript
Harbormaster completed remote builds in B200047: Diff 478616.Nov 29 2022, 10:24 AM
craig.topper added inline comments.Nov 29 2022, 4:24 PM
clang/test/Preprocessor/riscv-target-features.c
266

Check to end of line like the zve* versions

eopXD updated this revision to Diff 478784.Nov 29 2022, 7:05 PM

Add check for end-line.

eopXD marked an inline comment as done.Nov 29 2022, 7:06 PM
Harbormaster completed remote builds in B200158: Diff 478784.Nov 29 2022, 8:12 PM
kito-cheng accepted this revision.Nov 29 2022, 11:35 PM

LGTM.

I am thinking that we should use same way to define both __riscv_v_intrinsic_overloading[1] and __riscv_v_intrinsic, __riscv_v_intrinsic_overloading is defined in riscv_vector.h now, maybe we should defined that here too.

https://github.com/llvm/llvm-project/blob/main/clang/utils/TableGen/RISCVVEmitter.cpp#L401

This revision is now accepted and ready to land.Nov 29 2022, 11:35 PM
asb accepted this revision.Nov 30 2022, 3:16 AM

LGTM, thanks!

clang/lib/Basic/Targets/RISCV.cpp
195

Nit: comment should end with full stop.

This revision was landed with ongoing or failed builds.Nov 30 2022, 8:36 AM
Closed by commit rG482b8b493be0: [RISCV] Add macro to imply compiler availability on RISC-V Vector intrinsics… (authored by eopXD). · Explain Why
This revision was automatically updated to reflect the committed changes.
eopXD added a commit: rG482b8b493be0: [RISCV] Add macro to imply compiler availability on RISC-V Vector intrinsics….
eopXD added inline comments.Nov 30 2022, 8:43 AM
clang/lib/Basic/Targets/RISCV.cpp
195

Sorry I just landed the commit and missed this comment. May I ask what do yo mean by full stop here? Do you mean a period?

jrtc27 added inline comments.Nov 30 2022, 8:47 AM
clang/lib/Basic/Targets/RISCV.cpp
195

Full stop is British English for what is period in US English, yes

196

Do we not have a function to do these (major, minor) -> integer encodings? I guess not since currently the only other instance is in the loop above. Might be worth factoring that out if we're going to grow more of these.

eopXD marked 2 inline comments as done.Nov 30 2022, 9:08 AM
eopXD added inline comments.
clang/lib/Basic/Targets/RISCV.cpp
195

Done in https://reviews.llvm.org/rGd8a27ac0e27f

eopXD mentioned this in D139025: [NFC][RISCV] Extract utility to calculate value through MajorVersion and MinorVersion.Nov 30 2022, 9:20 AM

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
6 lines
test/
Preprocessor/
6 lines

Diff 478967

clang/lib/Basic/Targets/RISCV.cpp

Show First 20 Lines • Show All 184 Lines • ▼ Show 20 Lines if (MinVLen) {
Builder.defineMacro("__riscv_v_min_vlen", Twine(MinVLen)); Builder.defineMacro("__riscv_v_min_vlen", Twine(MinVLen));
Builder.defineMacro("__riscv_v_elen", Twine(MaxELen)); Builder.defineMacro("__riscv_v_elen", Twine(MaxELen));
Builder.defineMacro("__riscv_v_elen_fp", Twine(MaxELenFp)); Builder.defineMacro("__riscv_v_elen_fp", Twine(MaxELenFp));
} }
if (ISAInfo->hasExtension("c")) if (ISAInfo->hasExtension("c"))
Builder.defineMacro("__riscv_compressed"); Builder.defineMacro("__riscv_compressed");
if (ISAInfo->hasExtension("zve32x")) if (ISAInfo->hasExtension("zve32x")) {
Builder.defineMacro("__riscv_vector"); Builder.defineMacro("__riscv_vector");
// Currently we support the v0.10 RISC-V V intrinsics
asbUnsubmitted
Done
ReplyInline Actions

Nit: comment should end with full stop.

asb: Nit: comment should end with full stop.
eopXDAuthorUnsubmitted
Done
ReplyInline Actions

Sorry I just landed the commit and missed this comment. May I ask what do yo mean by full stop here? Do you mean a period?

eopXD: Sorry I just landed the commit and missed this comment. May I ask what do yo mean by full stop…
jrtc27Unsubmitted
Not Done
ReplyInline Actions

Full stop is British English for what is period in US English, yes

jrtc27: Full stop is British English for what is period in US English, yes
eopXDAuthorUnsubmitted
Done
ReplyInline Actions

Done in https://reviews.llvm.org/rGd8a27ac0e27f

eopXD: Done in https://reviews.llvm.org/rGd8a27ac0e27f
unsigned Version = (0 * 1000000) + (10 * 1000);
jrtc27Unsubmitted
Not Done
ReplyInline Actions

Do we not have a function to do these (major, minor) -> integer encodings? I guess not since currently the only other instance is in the loop above. Might be worth factoring that out if we're going to grow more of these.

jrtc27: Do we not have a function to do these (major, minor) -> integer encodings? I guess not since…
Builder.defineMacro("__riscv_v_intrinsic", Twine(Version));
}
} }
const Builtin::Info RISCVTargetInfo::BuiltinInfo[] = { const Builtin::Info RISCVTargetInfo::BuiltinInfo[] = {
#define BUILTIN(ID, TYPE, ATTRS) \ #define BUILTIN(ID, TYPE, ATTRS) \
{#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr}, {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr},
#define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) \ #define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) \
{#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE}, {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE},
#include "clang/Basic/BuiltinsRISCVVector.def" #include "clang/Basic/BuiltinsRISCVVector.def"
▲ Show 20 Lines • Show All 127 Lines • Show Last 20 Lines

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

Show All 20 Lines
// CHECK-NOT: __riscv_zihintntl // CHECK-NOT: __riscv_zihintntl
// CHECK-NOT: __riscv_zba // CHECK-NOT: __riscv_zba
// CHECK-NOT: __riscv_zbb // CHECK-NOT: __riscv_zbb
// CHECK-NOT: __riscv_zbc // CHECK-NOT: __riscv_zbc
// CHECK-NOT: __riscv_zbs // CHECK-NOT: __riscv_zbs
// CHECK-NOT: __riscv_zfh // CHECK-NOT: __riscv_zfh
// CHECK-NOT: __riscv_v // CHECK-NOT: __riscv_v
// CHECK-NOT: __riscv_vector // CHECK-NOT: __riscv_vector
// CHECK-NOT: __riscv_v_intrinsic
// CHECK-NOT: __riscv_zbkc // CHECK-NOT: __riscv_zbkc
// CHECK-NOT: __riscv_zbkx // CHECK-NOT: __riscv_zbkx
// CHECK-NOT: __riscv_zbkb // CHECK-NOT: __riscv_zbkb
// CHECK-NOT: __riscv_zkne // CHECK-NOT: __riscv_zkne
// CHECK-NOT: __riscv_zknd // CHECK-NOT: __riscv_zknd
// CHECK-NOT: __riscv_zknh // CHECK-NOT: __riscv_zknh
// CHECK-NOT: __riscv_zksh // CHECK-NOT: __riscv_zksh
// CHECK-NOT: __riscv_zksed // CHECK-NOT: __riscv_zksed
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
// RUN: | FileCheck --check-prefix=CHECK-ZVL65536b %s // RUN: | FileCheck --check-prefix=CHECK-ZVL65536b %s
// CHECK-ZVL65536b: __riscv_v_min_vlen 65536 // CHECK-ZVL65536b: __riscv_v_min_vlen 65536
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64ifdzve64d1p0 -x c -E -dM %s -o - \ // RUN: -march=rv64ifdzve64d1p0 -x c -E -dM %s -o - \
// RUN: | FileCheck --check-prefix=CHECK-ZVE64D-EXT %s // RUN: | FileCheck --check-prefix=CHECK-ZVE64D-EXT %s
// CHECK-ZVE64D-EXT: __riscv_v_elen 64 // CHECK-ZVE64D-EXT: __riscv_v_elen 64
// CHECK-ZVE64D-EXT: __riscv_v_elen_fp 64 // CHECK-ZVE64D-EXT: __riscv_v_elen_fp 64
// CHECK-ZVE64D-EXT: __riscv_v_intrinsic 10000{{$}}
craig.topperUnsubmitted
Done
ReplyInline Actions

Check to end of line like the zve* versions

craig.topper: Check to end of line like the zve* versions
// CHECK-ZVE64D-EXT: __riscv_v_min_vlen 64 // CHECK-ZVE64D-EXT: __riscv_v_min_vlen 64
// CHECK-ZVE64D-EXT: __riscv_vector 1 // CHECK-ZVE64D-EXT: __riscv_vector 1
// CHECK-ZVE64D-EXT: __riscv_zve32f 1000000{{$}} // CHECK-ZVE64D-EXT: __riscv_zve32f 1000000{{$}}
// CHECK-ZVE64D-EXT: __riscv_zve32x 1000000{{$}} // CHECK-ZVE64D-EXT: __riscv_zve32x 1000000{{$}}
// CHECK-ZVE64D-EXT: __riscv_zve64d 1000000{{$}} // CHECK-ZVE64D-EXT: __riscv_zve64d 1000000{{$}}
// CHECK-ZVE64D-EXT: __riscv_zve64f 1000000{{$}} // CHECK-ZVE64D-EXT: __riscv_zve64f 1000000{{$}}
// CHECK-ZVE64D-EXT: __riscv_zve64x 1000000{{$}} // CHECK-ZVE64D-EXT: __riscv_zve64x 1000000{{$}}
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64ifzve64f1p0 -x c -E -dM %s -o - \ // RUN: -march=rv64ifzve64f1p0 -x c -E -dM %s -o - \
// RUN: | FileCheck --check-prefix=CHECK-ZVE64F-EXT %s // RUN: | FileCheck --check-prefix=CHECK-ZVE64F-EXT %s
// CHECK-ZVE64F-EXT: __riscv_v_elen 64 // CHECK-ZVE64F-EXT: __riscv_v_elen 64
// CHECK-ZVE64F-EXT: __riscv_v_elen_fp 32 // CHECK-ZVE64F-EXT: __riscv_v_elen_fp 32
// CHECK-ZVE64F-EXT: __riscv_v_intrinsic 10000{{$}}
// CHECK-ZVE64F-EXT: __riscv_v_min_vlen 64 // CHECK-ZVE64F-EXT: __riscv_v_min_vlen 64
// CHECK-ZVE64F-EXT: __riscv_vector 1 // CHECK-ZVE64F-EXT: __riscv_vector 1
// CHECK-ZVE64F-EXT: __riscv_zve32f 1000000{{$}} // CHECK-ZVE64F-EXT: __riscv_zve32f 1000000{{$}}
// CHECK-ZVE64F-EXT: __riscv_zve32x 1000000{{$}} // CHECK-ZVE64F-EXT: __riscv_zve32x 1000000{{$}}
// CHECK-ZVE64F-EXT: __riscv_zve64f 1000000{{$}} // CHECK-ZVE64F-EXT: __riscv_zve64f 1000000{{$}}
// CHECK-ZVE64F-EXT: __riscv_zve64x 1000000{{$}} // CHECK-ZVE64F-EXT: __riscv_zve64x 1000000{{$}}
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64izve64x1p0 -x c -E -dM %s -o - \ // RUN: -march=rv64izve64x1p0 -x c -E -dM %s -o - \
// RUN: | FileCheck --check-prefix=CHECK-ZVE64X-EXT %s // RUN: | FileCheck --check-prefix=CHECK-ZVE64X-EXT %s
// CHECK-ZVE64X-EXT: __riscv_v_elen 64 // CHECK-ZVE64X-EXT: __riscv_v_elen 64
// CHECK-ZVE64X-EXT: __riscv_v_elen_fp 0 // CHECK-ZVE64X-EXT: __riscv_v_elen_fp 0
// CHECK-ZVE64X-EXT: __riscv_v_intrinsic 10000{{$}}
// CHECK-ZVE64X-EXT: __riscv_v_min_vlen 64 // CHECK-ZVE64X-EXT: __riscv_v_min_vlen 64
// CHECK-ZVE64X-EXT: __riscv_vector 1 // CHECK-ZVE64X-EXT: __riscv_vector 1
// CHECK-ZVE64X-EXT: __riscv_zve32x 1000000{{$}} // CHECK-ZVE64X-EXT: __riscv_zve32x 1000000{{$}}
// CHECK-ZVE64X-EXT: __riscv_zve64x 1000000{{$}} // CHECK-ZVE64X-EXT: __riscv_zve64x 1000000{{$}}
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64ifzve32f1p0 -x c -E -dM %s -o - \ // RUN: -march=rv64ifzve32f1p0 -x c -E -dM %s -o - \
// RUN: | FileCheck --check-prefix=CHECK-ZVE32F-EXT %s // RUN: | FileCheck --check-prefix=CHECK-ZVE32F-EXT %s
// CHECK-ZVE32F-EXT: __riscv_v_elen 32 // CHECK-ZVE32F-EXT: __riscv_v_elen 32
// CHECK-ZVE32F-EXT: __riscv_v_elen_fp 32 // CHECK-ZVE32F-EXT: __riscv_v_elen_fp 32
// CHECK-ZVE32F-EXT: __riscv_v_intrinsic 10000{{$}}
// CHECK-ZVE32F-EXT: __riscv_v_min_vlen 32 // CHECK-ZVE32F-EXT: __riscv_v_min_vlen 32
// CHECK-ZVE32F-EXT: __riscv_vector 1 // CHECK-ZVE32F-EXT: __riscv_vector 1
// CHECK-ZVE32F-EXT: __riscv_zve32f 1000000{{$}} // CHECK-ZVE32F-EXT: __riscv_zve32f 1000000{{$}}
// CHECK-ZVE32F-EXT: __riscv_zve32x 1000000{{$}} // CHECK-ZVE32F-EXT: __riscv_zve32x 1000000{{$}}
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64izve32x1p0 -x c -E -dM %s -o - \ // RUN: -march=rv64izve32x1p0 -x c -E -dM %s -o - \
// RUN: | FileCheck --check-prefix=CHECK-ZVE32X-EXT %s // RUN: | FileCheck --check-prefix=CHECK-ZVE32X-EXT %s
// CHECK-ZVE32X-EXT: __riscv_v_elen 32 // CHECK-ZVE32X-EXT: __riscv_v_elen 32
// CHECK-ZVE32X-EXT: __riscv_v_elen_fp 0 // CHECK-ZVE32X-EXT: __riscv_v_elen_fp 0
// CHECK-ZVE32X-EXT: __riscv_v_intrinsic 10000{{$}}
// CHECK-ZVE32X-EXT: __riscv_v_min_vlen 32 // CHECK-ZVE32X-EXT: __riscv_v_min_vlen 32
// CHECK-ZVE32X-EXT: __riscv_vector 1 // CHECK-ZVE32X-EXT: __riscv_vector 1
// CHECK-ZVE32X-EXT: __riscv_zve32x 1000000{{$}} // CHECK-ZVE32X-EXT: __riscv_zve32x 1000000{{$}}
// RUN: %clang -target riscv64-unknown-linux-gnu \ // RUN: %clang -target riscv64-unknown-linux-gnu \
// RUN: -march=rv64izbkc1p0 -x c -E -dM %s -o - \ // RUN: -march=rv64izbkc1p0 -x c -E -dM %s -o - \
// RUN: | FileCheck --check-prefix=CHECK-ZBKC-EXT %s // RUN: | FileCheck --check-prefix=CHECK-ZBKC-EXT %s
// CHECK-ZBKC-EXT: __riscv_zbkc // CHECK-ZBKC-EXT: __riscv_zbkc
▲ Show 20 Lines • Show All 134 Lines • Show Last 20 Lines