Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RISCV][compiler-rt] create __riscv__cpu_model for vendorID, ArchID, … #101449

Merged
merged 2 commits into from
Aug 14, 2024
Merged

[RISCV][compiler-rt] create __riscv__cpu_model for vendorID, ArchID, … #101449

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc86105
[RISCV][compiler-rt] create __riscv__cpu_model for vendorID, ArchID, …
BeMg Aug 1, 2024
1289c26
__riscv__cpu_model -> __riscv_cpu_model
BeMg Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions compiler-rt/lib/builtins/cpu_model/riscv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ struct {

#define RISCV_VENDOR_FEATURE_BITS_LENGTH 1
struct {
unsigned vendorID;
unsigned length;
unsigned long long features[RISCV_VENDOR_FEATURE_BITS_LENGTH];
} __riscv_vendor_feature_bits __attribute__((visibility("hidden"), nocommon));

struct {
unsigned mVendorID;
unsigned mArchID;
unsigned mImplID;
} __riscv_cpu_model __attribute__((visibility("hidden"), nocommon));

// NOTE: Should sync-up with RISCVFeatures.td
// TODO: Maybe generate a header from tablegen then include it.
#define A_GROUPID 0
Expand Down Expand Up @@ -208,8 +213,10 @@ static void initRISCVFeature(struct riscv_hwprobe Hwprobes[]) {
// will be cleared to -1, and its value set to 0.
// This unsets all extension bitmask bits.

// Init vendor extension
__riscv_vendor_feature_bits.vendorID = Hwprobes[2].value;
// Init VendorID, ArchID, ImplID
__riscv_cpu_model.mVendorID = Hwprobes[2].value;
__riscv_cpu_model.mArchID = Hwprobes[3].value;
__riscv_cpu_model.mImplID = Hwprobes[4].value;

// Init standard extension
// TODO: Maybe Extension implied generate from tablegen?
Expand Down Expand Up @@ -297,9 +304,9 @@ void CONSTRUCTOR_ATTRIBUTE __init_riscv_feature_bits() {

#if defined(__linux__)
struct riscv_hwprobe Hwprobes[] = {
{RISCV_HWPROBE_KEY_BASE_BEHAVIOR, 0},
{RISCV_HWPROBE_KEY_IMA_EXT_0, 0},
{RISCV_HWPROBE_KEY_MVENDORID, 0},
{RISCV_HWPROBE_KEY_BASE_BEHAVIOR, 0}, {RISCV_HWPROBE_KEY_IMA_EXT_0, 0},
{RISCV_HWPROBE_KEY_MVENDORID, 0}, {RISCV_HWPROBE_KEY_MARCHID, 0},
{RISCV_HWPROBE_KEY_MIMPID, 0},
};
if (initHwProbe(Hwprobes, sizeof(Hwprobes) / sizeof(Hwprobes[0])))
return;
Expand Down
Loading