Skip to content

Commit

Permalink
Refine CI setup pt 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@lczech
lczech committed Jul 2, 2024
1 parent 79eb6ab commit fd35f09
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 23 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@ jobs:

matrix:

# Need dummy entries for the matrix to pick up the variables
os: []
compiler: []

# Default to debug build
build_type:
- DEBUG
# - RELEASE

# Default to building with htslib
htslib:
- ON
# - OFF
Expand Down Expand Up @@ -423,7 +429,7 @@ jobs:
- name: Setup C++
# Reference: https://github.com/marketplace/actions/setup-cpp-c-c
uses: aminya/[email protected]
if: matrix.compiler != 'apple'
if: ${{ matrix.compiler != 'apple' && matrix.os != 'macos-latest' }}
with:
compiler: ${{ matrix.compiler }}
cmake: true
Expand Down
65 changes: 43 additions & 22 deletions lib/genesis/utils/core/info.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@
# include <sys/types.h>
# include <unistd.h>
#else
# warning "No cpuid intrinsic defined for compiler."
// # warning "No cpuid intrinsic defined for compiler."
#endif

#if !(defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
# warning "No cpuid intrinsic defined for processor architecture."
// # warning "No cpuid intrinsic defined for processor architecture."
#endif

// For current usage
Expand Down Expand Up @@ -365,7 +365,27 @@ std::string info_print_compiler()
#endif
}

#else // defined( _WIN32 ) || defined( _WIN64 )
#elif defined(__arm__) // for M1/M2 chips

void get_cpuid_(int32_t out[4], int32_t eax, int32_t ecx)
{
// On MacOS with M1/M2 arm chips, we do not detect any features at the moment.
// That means we will just run vanilla code, but well, can't support everything.
out[0] = out[1] = out[2] = out[3] = 0;
}

uint64_t xgetbv(unsigned int index)
{
return 0;
}

bool detect_OS_x64_()
{
// For now, we assume that any arm is actually a 64bit M1/M2 or comparable...
return true;
}

#else

void get_cpuid_(int32_t out[4], int32_t eax, int32_t ecx)
{
Expand All @@ -391,15 +411,13 @@ std::string info_print_compiler()
return ((uint64_t)edx << 32) | eax;
}

#define _XCR_XFEATURE_ENABLED_MASK 0

// Detect 64-bit
bool detect_OS_x64_(){
bool detect_OS_x64_() {
// We only support x64 on Linux.
return true;
}

#endif // defined( _WIN32 ) || defined( _WIN64 )
#endif

#if defined(__linux__)

Expand Down Expand Up @@ -446,6 +464,7 @@ bool detect_OS_AVX_()
bool cpuAVXSuport = (cpuInfo[2] & (1 << 28)) != 0;

if( osUsesXSAVE_XRSTORE && cpuAVXSuport ) {
auto const _XCR_XFEATURE_ENABLED_MASK = 0;
uint64_t xcrFeatureMask = xgetbv(_XCR_XFEATURE_ENABLED_MASK);
avxSupported = (xcrFeatureMask & 0x6) == 0x6;
}
Expand All @@ -459,6 +478,7 @@ bool detect_OS_AVX512_()
return false;
}

auto const _XCR_XFEATURE_ENABLED_MASK = 0;
uint64_t xcrFeatureMask = xgetbv(_XCR_XFEATURE_ENABLED_MASK);
return (xcrFeatureMask & 0xe6) == 0xe6;
}
Expand Down Expand Up @@ -588,9 +608,9 @@ InfoHardware const& info_get_hardware()

// Vendor
result.vendor_string = get_vendor_string_();
if( result.vendor_string == "GenuineIntel" ){
if( result.vendor_string == "GenuineIntel" ) {
result.vendor_Intel = true;
}else if( result.vendor_string == "AuthenticAMD" ){
} else if( result.vendor_string == "AuthenticAMD" ) {
result.vendor_AMD = true;
}
result.cpu_model = get_cpu_model_();
Expand All @@ -613,14 +633,14 @@ InfoHardware const& info_get_hardware()
// Now run the feature detection

int32_t info[4];
get_cpuid_(info, 0, 0);
get_cpuid_( info, 0, 0 );
int nIds = info[0];

get_cpuid_(info, 0x80000000, 0);
get_cpuid_( info, 0x80000000, 0 );
uint32_t nExIds = info[0];

if (nIds >= 0x00000001){
get_cpuid_(info, 0x00000001, 0);
if( nIds >= 0x00000001 ) {
get_cpuid_( info, 0x00000001, 0 );
result.HW_MMX = (info[3] & ((int)1 << 23)) != 0;
result.HW_SSE = (info[3] & ((int)1 << 25)) != 0;
result.HW_SSE2 = (info[3] & ((int)1 << 26)) != 0;
Expand All @@ -636,8 +656,8 @@ InfoHardware const& info_get_hardware()

result.HW_RDRAND = (info[2] & ((int)1 << 30)) != 0;
}
if (nIds >= 0x00000007){
get_cpuid_(info, 0x00000007, 0);
if( nIds >= 0x00000007 ) {
get_cpuid_( info, 0x00000007, 0 );
result.HW_AVX2 = (info[1] & ((int)1 << 5)) != 0;

result.HW_BMI1 = (info[1] & ((int)1 << 3)) != 0;
Expand Down Expand Up @@ -673,11 +693,11 @@ InfoHardware const& info_get_hardware()
result.HW_AVX512_VPCLMUL = (info[2] & ((int)1 << 10)) != 0;
result.HW_AVX512_BITALG = (info[2] & ((int)1 << 12)) != 0;

get_cpuid_(info, 0x00000007, 1);
get_cpuid_( info, 0x00000007, 1 );
result.HW_AVX512_BF16 = (info[0] & ((int)1 << 5)) != 0;
}
if (nExIds >= 0x80000001){
get_cpuid_(info, 0x80000001, 0);
if( nExIds >= 0x80000001 ) {
get_cpuid_( info, 0x80000001, 0 );
result.HW_x64 = (info[3] & ((int)1 << 29)) != 0;
result.HW_ABM = (info[2] & ((int)1 << 5)) != 0;
result.HW_SSE4a = (info[2] & ((int)1 << 6)) != 0;
Expand Down Expand Up @@ -1458,7 +1478,8 @@ size_t info_process_current_file_count()
// Current Mem/CPU - Linux
// -------------------------------------------------------------------------

size_t parse_status_line_( char* line ){
size_t parse_status_line_( char* line )
{
// Helper function to parse "/proc/self/status", see
// https://stackoverflow.com/q/63166/4184258
// Adapted from there to add error checking.
Expand Down Expand Up @@ -1509,8 +1530,8 @@ size_t info_process_current_file_count()
return 0;
}

while( fgets( line, 128, file ) != NULL ){
if( strncmp( line, "VmRSS:", 6 ) == 0 ){
while( fgets( line, 128, file ) != NULL ) {
if( strncmp( line, "VmRSS:", 6 ) == 0 ) {
result = parse_status_line_(line);
break;
}
Expand Down Expand Up @@ -1542,7 +1563,7 @@ size_t info_process_current_file_count()
return 0;
}
char line[128];
while(fgets(line, 128, file) != NULL){
while( fgets(line, 128, file) != NULL) {
if( strncmp(line, "processor", 9) == 0 ) {
++num_processors;
}
Expand Down

0 comments on commit fd35f09

Please sign in to comment.