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

Rust and jit cpu features #63

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Rust and jit cpu features #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc2188
Reorganize the CPU feature detection
antoyo Oct 11, 2024
ff58217
Include i386-rust-and-jit.inc to remove code duplication
antoyo Oct 11, 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
165 changes: 5 additions & 160 deletions gcc/config/i386/i386-jit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,7 @@ along with GCC; see the file COPYING3. If not see
void
ix86_jit_target_versions (void)
{
if (TARGET_64BIT)
{
jit_add_target_info ("target_arch", "x86_64");

// TODO
/*if (TARGET_X32)
jit_add_target_info ("target_arch", "D_X32");*/
}
else
jit_add_target_info ("target_arch", "x86");
// TODO: remove this hook.
}

/* Implement TARGET_JIT_REGISTER_CPU_TARGET_INFO. */
Expand Down Expand Up @@ -79,157 +70,11 @@ ix86_jit_register_target_info (void)

if (float64_type_node != NULL && TYPE_PRECISION(float64_type_node) == 64)
jit_target_add_supported_target_dependent_type(GCC_JIT_TYPE_FLOAT64);

if (float128_type_node != NULL && TYPE_PRECISION(float128_type_node) == 128)
jit_target_add_supported_target_dependent_type(GCC_JIT_TYPE_FLOAT128);

if (TARGET_MMX)
jit_add_target_info ("target_feature", "mmx");
if (TARGET_SSE)
jit_add_target_info("target_feature", "sse");
if (TARGET_SSE2)
jit_add_target_info("target_feature", "sse2");
if (TARGET_SSE3)
jit_add_target_info("target_feature", "sse3");
if (TARGET_SSSE3)
jit_add_target_info("target_feature", "ssse3");
if (TARGET_SSE4_1)
jit_add_target_info("target_feature", "sse4.1");
if (TARGET_SSE4_2)
jit_add_target_info("target_feature", "sse4.2");
if (TARGET_AES)
jit_add_target_info("target_feature", "aes");
if (TARGET_SHA)
jit_add_target_info("target_feature", "sha");
if (TARGET_AVX)
jit_add_target_info("target_feature", "avx");
if (TARGET_AVX2)
jit_add_target_info("target_feature", "avx2");
if (TARGET_AVX512F)
jit_add_target_info("target_feature", "avx512f");
// TODO: update the name:
/*if (TARGET_AVX512ER)
jit_add_target_info("target_feature", "avx512er");*/
if (TARGET_AVX512CD)
jit_add_target_info("target_feature", "avx512cd");
// TODO: update the name:
/*if (TARGET_AVX512PF)
jit_add_target_info("target_feature", "avx512pf");*/
if (TARGET_AVX512DQ)
jit_add_target_info("target_feature", "avx512dq");
if (TARGET_AVX512BW)
jit_add_target_info("target_feature", "avx512bw");
if (TARGET_AVX512VL)
jit_add_target_info("target_feature", "avx512vl");
if (TARGET_AVX512VBMI)
jit_add_target_info("target_feature", "avx512vbmi");
if (TARGET_AVX512IFMA)
jit_add_target_info("target_feature", "avx512ifma");
if (TARGET_AVX512VPOPCNTDQ)
jit_add_target_info("target_feature", "avx512vpopcntdq");
if (TARGET_FMA)
jit_add_target_info("target_feature", "fma");
if (TARGET_RTM)
jit_add_target_info("target_feature", "rtm");
if (TARGET_SSE4A)
jit_add_target_info("target_feature", "sse4a");
if (TARGET_BMI) {
jit_add_target_info("target_feature", "bmi1");
jit_add_target_info("target_feature", "bmi");
}
if (TARGET_BMI2)
jit_add_target_info("target_feature", "bmi2");
if (TARGET_LZCNT)
jit_add_target_info("target_feature", "lzcnt");
if (TARGET_TBM)
jit_add_target_info("target_feature", "tbm");
if (TARGET_POPCNT)
jit_add_target_info("target_feature", "popcnt");
if (TARGET_RDRND) {
jit_add_target_info("target_feature", "rdrand");
jit_add_target_info("target_feature", "rdrnd");
}
if (TARGET_F16C)
jit_add_target_info("target_feature", "f16c");
if (TARGET_RDSEED)
jit_add_target_info("target_feature", "rdseed");
if (TARGET_ADX)
jit_add_target_info("target_feature", "adx");
if (TARGET_FXSR)
jit_add_target_info("target_feature", "fxsr");
if (TARGET_XSAVE)
jit_add_target_info("target_feature", "xsave");
if (TARGET_XSAVEOPT)
jit_add_target_info("target_feature", "xsaveopt");
if (TARGET_XSAVEC)
jit_add_target_info("target_feature", "xsavec");
if (TARGET_XSAVES)
jit_add_target_info("target_feature", "xsaves");
if (TARGET_VPCLMULQDQ) {
jit_add_target_info("target_feature", "pclmulqdq");
jit_add_target_info("target_feature", "vpclmulqdq");
}
if (TARGET_CMPXCHG16B)
jit_add_target_info("target_feature", "cmpxchg16b");
if (TARGET_MOVBE)
jit_add_target_info("target_feature", "movbe");
if (TARGET_AVX512VBMI2)
jit_add_target_info("target_feature", "avx512vbmi2");
if (TARGET_PKU)
jit_add_target_info("target_feature", "pku");
if (TARGET_AVX512VNNI)
jit_add_target_info("target_feature", "avx512vnni");
if (TARGET_AVX512BF16)
jit_add_target_info("target_feature", "avx512bf16");
if (TARGET_AVX512BITALG)
jit_add_target_info("target_feature", "avx512bitalg");
if (TARGET_AVX512VP2INTERSECT)
jit_add_target_info("target_feature", "avx512vp2intersect");
if (TARGET_PCLMUL)
jit_add_target_info("target_feature", "pclmul");
if (TARGET_GFNI)
jit_add_target_info("target_feature", "gfni");
if (TARGET_FMA4)
jit_add_target_info("target_feature", "fma4");
if (TARGET_XOP)
jit_add_target_info("target_feature", "xop");
if (TARGET_AVXIFMA)
jit_add_target_info("target_feature", "avxifma");
if (TARGET_AVXNECONVERT)
jit_add_target_info("target_feature", "avxneconvert");
if (TARGET_AVXVNNIINT8)
jit_add_target_info("target_feature", "avxvnniint8");
if (TARGET_AVXVNNIINT16)
jit_add_target_info("target_feature", "avxvnniint16");

// this is only enabled by choice in llvm, never by default - TODO determine if gcc enables it
// jit_add_target_info("target_feature", "sse-unaligned-mem");

if (TARGET_VAES)
jit_add_target_info("target_feature", "vaes");
if (TARGET_LWP)
jit_add_target_info("target_feature", "lwp");
if (TARGET_FSGSBASE)
jit_add_target_info("target_feature", "fsgsbase");
if (TARGET_SHSTK)
jit_add_target_info("target_feature", "shstk");
if (TARGET_PRFCHW)
jit_add_target_info("target_feature", "prfchw");
if (TARGET_SAHF) // would this be better as TARGET_USE_SAHF?
jit_add_target_info("target_feature", "sahf");
if (TARGET_MWAITX)
jit_add_target_info("target_feature", "mwaitx");
if (TARGET_CLZERO)
jit_add_target_info("target_feature", "clzero");
if (TARGET_CLDEMOTE)
jit_add_target_info("target_feature", "cldemote");
if (TARGET_PTWRITE)
jit_add_target_info("target_feature", "ptwrite");
bool hasERMSB = ix86_arch == PROCESSOR_HASWELL || ix86_arch == PROCESSOR_SKYLAKE
|| ix86_arch == PROCESSOR_SKYLAKE_AVX512 || ix86_arch == PROCESSOR_CANNONLAKE
|| ix86_arch == PROCESSOR_ICELAKE_CLIENT || ix86_arch == PROCESSOR_ICELAKE_SERVER
|| ix86_arch == PROCESSOR_CASCADELAKE || ix86_arch == PROCESSOR_TIGERLAKE
|| ix86_arch == PROCESSOR_COOPERLAKE;
if (hasERMSB)
jit_add_target_info("target_feature", "ermsbd");
#define ADD_TARGET_INFO jit_add_target_info
#include "i386-rust-and-jit.inc"
#undef ADD_TARGET_INFO
}
93 changes: 93 additions & 0 deletions gcc/config/i386/i386-rust-and-jit.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
if (TARGET_64BIT)
ADD_TARGET_INFO ("target_arch", "x86_64");
else
ADD_TARGET_INFO ("target_arch", "x86");

// features officially "stabilised" in rustc
if (TARGET_MMX)
ADD_TARGET_INFO ("target_feature", "mmx");
if (TARGET_SSE)
ADD_TARGET_INFO ("target_feature", "sse");
if (TARGET_SSE2)
ADD_TARGET_INFO ("target_feature", "sse2");
if (TARGET_SSE3)
ADD_TARGET_INFO ("target_feature", "sse3");
if (TARGET_SSSE3)
ADD_TARGET_INFO ("target_feature", "ssse3");
if (TARGET_SSE4_1)
ADD_TARGET_INFO ("target_feature", "sse4.1");
if (TARGET_SSE4_2)
ADD_TARGET_INFO ("target_feature", "sse4.2");
if (TARGET_AES)
ADD_TARGET_INFO ("target_feature", "aes");
if (TARGET_SHA)
ADD_TARGET_INFO ("target_feature", "sha");
if (TARGET_AVX)
ADD_TARGET_INFO ("target_feature", "avx");
if (TARGET_AVX2)
ADD_TARGET_INFO ("target_feature", "avx2");
if (TARGET_AVX512F)
ADD_TARGET_INFO ("target_feature", "avx512f");
if (TARGET_AVX512CD)
ADD_TARGET_INFO ("target_feature", "avx512cd");
if (TARGET_AVX512DQ)
ADD_TARGET_INFO ("target_feature", "avx512dq");
if (TARGET_AVX512BW)
ADD_TARGET_INFO ("target_feature", "avx512bw");
if (TARGET_AVX512VL)
ADD_TARGET_INFO ("target_feature", "avx512vl");
if (TARGET_AVX512VBMI)
ADD_TARGET_INFO ("target_feature", "avx512vbmi");
if (TARGET_AVX512IFMA)
ADD_TARGET_INFO ("target_feature", "avx512ifma");
if (TARGET_AVX512VPOPCNTDQ)
ADD_TARGET_INFO ("target_feature", "avx512vpopcntdq");
if (TARGET_FMA)
ADD_TARGET_INFO ("target_feature", "fma");
if (TARGET_RTM)
ADD_TARGET_INFO ("target_feature", "rtm");
if (TARGET_SSE4A)
ADD_TARGET_INFO ("target_feature", "sse4a");
if (TARGET_BMI)
{
ADD_TARGET_INFO ("target_feature", "bmi1");
ADD_TARGET_INFO ("target_feature", "bmi");
}
if (TARGET_BMI2)
ADD_TARGET_INFO ("target_feature", "bmi2");
if (TARGET_LZCNT)
ADD_TARGET_INFO ("target_feature", "lzcnt");
if (TARGET_TBM)
ADD_TARGET_INFO ("target_feature", "tbm");
if (TARGET_POPCNT)
ADD_TARGET_INFO ("target_feature", "popcnt");
if (TARGET_RDRND)
{
ADD_TARGET_INFO ("target_feature", "rdrand");
ADD_TARGET_INFO ("target_feature", "rdrnd");
}
if (TARGET_F16C)
ADD_TARGET_INFO ("target_feature", "f16c");
if (TARGET_RDSEED)
ADD_TARGET_INFO ("target_feature", "rdseed");
if (TARGET_ADX)
ADD_TARGET_INFO ("target_feature", "adx");
if (TARGET_FXSR)
ADD_TARGET_INFO ("target_feature", "fxsr");
if (TARGET_XSAVE)
ADD_TARGET_INFO ("target_feature", "xsave");
if (TARGET_XSAVEOPT)
ADD_TARGET_INFO ("target_feature", "xsaveopt");
if (TARGET_XSAVEC)
ADD_TARGET_INFO ("target_feature", "xsavec");
if (TARGET_XSAVES)
ADD_TARGET_INFO ("target_feature", "xsaves");
if (TARGET_VPCLMULQDQ)
{
ADD_TARGET_INFO ("target_feature", "pclmulqdq");
ADD_TARGET_INFO ("target_feature", "vpclmulqdq");
}
if (TARGET_CMPXCHG16B)
ADD_TARGET_INFO ("target_feature", "cmpxchg16b");
if (TARGET_MOVBE)
ADD_TARGET_INFO ("target_feature", "movbe");
96 changes: 3 additions & 93 deletions gcc/config/i386/i386-rust.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,97 +29,7 @@ along with GCC; see the file COPYING3. If not see
void
ix86_rust_target_cpu_info (void)
{
if (TARGET_64BIT)
rust_add_target_info ("target_arch", "x86_64");
else
rust_add_target_info ("target_arch", "x86");

// features officially "stabilised" in rustc
if (TARGET_MMX)
rust_add_target_info ("target_feature", "mmx");
if (TARGET_SSE)
rust_add_target_info ("target_feature", "sse");
if (TARGET_SSE2)
rust_add_target_info ("target_feature", "sse2");
if (TARGET_SSE3)
rust_add_target_info ("target_feature", "sse3");
if (TARGET_SSSE3)
rust_add_target_info ("target_feature", "ssse3");
if (TARGET_SSE4_1)
rust_add_target_info ("target_feature", "sse4.1");
if (TARGET_SSE4_2)
rust_add_target_info ("target_feature", "sse4.2");
if (TARGET_AES)
rust_add_target_info ("target_feature", "aes");
if (TARGET_SHA)
rust_add_target_info ("target_feature", "sha");
if (TARGET_AVX)
rust_add_target_info ("target_feature", "avx");
if (TARGET_AVX2)
rust_add_target_info ("target_feature", "avx2");
if (TARGET_AVX512F)
rust_add_target_info ("target_feature", "avx512f");
if (TARGET_AVX512CD)
rust_add_target_info ("target_feature", "avx512cd");
if (TARGET_AVX512DQ)
rust_add_target_info ("target_feature", "avx512dq");
if (TARGET_AVX512BW)
rust_add_target_info ("target_feature", "avx512bw");
if (TARGET_AVX512VL)
rust_add_target_info ("target_feature", "avx512vl");
if (TARGET_AVX512VBMI)
rust_add_target_info ("target_feature", "avx512vbmi");
if (TARGET_AVX512IFMA)
rust_add_target_info ("target_feature", "avx512ifma");
if (TARGET_AVX512VPOPCNTDQ)
rust_add_target_info ("target_feature", "avx512vpopcntdq");
if (TARGET_FMA)
rust_add_target_info ("target_feature", "fma");
if (TARGET_RTM)
rust_add_target_info ("target_feature", "rtm");
if (TARGET_SSE4A)
rust_add_target_info ("target_feature", "sse4a");
if (TARGET_BMI)
{
rust_add_target_info ("target_feature", "bmi1");
rust_add_target_info ("target_feature", "bmi");
}
if (TARGET_BMI2)
rust_add_target_info ("target_feature", "bmi2");
if (TARGET_LZCNT)
rust_add_target_info ("target_feature", "lzcnt");
if (TARGET_TBM)
rust_add_target_info ("target_feature", "tbm");
if (TARGET_POPCNT)
rust_add_target_info ("target_feature", "popcnt");
if (TARGET_RDRND)
{
rust_add_target_info ("target_feature", "rdrand");
rust_add_target_info ("target_feature", "rdrnd");
}
if (TARGET_F16C)
rust_add_target_info ("target_feature", "f16c");
if (TARGET_RDSEED)
rust_add_target_info ("target_feature", "rdseed");
if (TARGET_ADX)
rust_add_target_info ("target_feature", "adx");
if (TARGET_FXSR)
rust_add_target_info ("target_feature", "fxsr");
if (TARGET_XSAVE)
rust_add_target_info ("target_feature", "xsave");
if (TARGET_XSAVEOPT)
rust_add_target_info ("target_feature", "xsaveopt");
if (TARGET_XSAVEC)
rust_add_target_info ("target_feature", "xsavec");
if (TARGET_XSAVES)
rust_add_target_info ("target_feature", "xsaves");
if (TARGET_VPCLMULQDQ)
{
rust_add_target_info ("target_feature", "pclmulqdq");
rust_add_target_info ("target_feature", "vpclmulqdq");
}
if (TARGET_CMPXCHG16B)
rust_add_target_info ("target_feature", "cmpxchg16b");
if (TARGET_MOVBE)
rust_add_target_info ("target_feature", "movbe");
#define ADD_TARGET_INFO rust_add_target_info
#include "i386-rust-and-jit.inc"
#undef ADD_TARGET_INFO
}
Loading