Skip to content

Commit

Permalink
Merge pull request #15729 from pshipton/avx512fix0.33.1
Browse files Browse the repository at this point in the history
(0.33.1) Remove AVX512F from the features supported by our portable CPU description
  • Loading branch information
AdamBrousseau authored Aug 17, 2022
2 parents 47389a5 + 6d25057 commit e8f24e9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions runtime/compiler/x/env/J9CPU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ TR::JitConfig * TR::JitConfig::instance() { return NULL; }
TR::CPU
J9::X86::CPU::detectRelocatable(OMRPortLibrary * const omrPortLib)
{
// Sandybridge Architecture is selected to be our default portable processor description
// For our portable processor description we allow only features present in the Sandybridge Architecture
const uint32_t customFeatures [] = {OMR_FEATURE_X86_FPU, OMR_FEATURE_X86_CX8, OMR_FEATURE_X86_CMOV,
OMR_FEATURE_X86_MMX, OMR_FEATURE_X86_SSE, OMR_FEATURE_X86_SSE2,
OMR_FEATURE_X86_SSSE3, OMR_FEATURE_X86_SSE4_1, OMR_FEATURE_X86_POPCNT,
OMR_FEATURE_X86_SSE3, OMR_FEATURE_X86_AESNI, OMR_FEATURE_X86_AVX,
OMR_FEATURE_X86_AVX512F};
OMR_FEATURE_X86_SSE3, OMR_FEATURE_X86_AESNI, OMR_FEATURE_X86_AVX
};

OMRPORT_ACCESS_FROM_OMRPORT(omrPortLib);
OMRProcessorDesc customProcessorDescription;
Expand Down Expand Up @@ -157,7 +157,7 @@ J9::X86::CPU::supportsFeature(uint32_t feature)
TR_ASSERT_FATAL(self()->supports_feature_test(feature), "Old API and new API did not match: processor feature %d\n", feature);
TR_ASSERT_FATAL(TRUE == omrsysinfo_processor_has_feature(&_supportedFeatureMasks, feature), "New processor feature usage detected, please add feature %d to _supportedFeatureMasks via TR::CPU::enableFeatureMasks()\n", feature);
}

return TRUE == omrsysinfo_processor_has_feature(&_processorDescription, feature);
}

Expand Down

0 comments on commit e8f24e9

Please sign in to comment.