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.

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

Fix build break on Power #10604

Merged
merged 1 commit into from
Sep 16, 2020
Merged
Changes from all commits
Commits
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
30 changes: 0 additions & 30 deletions runtime/compiler/p/env/J9CPU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,48 +69,18 @@ J9::Power::CPU::supports_feature_test(uint32_t feature)
bool
J9::Power::CPU::is(OMRProcessorArchitecture p)
{
if (TR::Compiler->omrPortLib == NULL)
return self()->id() == self()->get_old_processor_type_from_new_processor_type(p);

#if defined(J9VM_OPT_JITSERVER)
if (TR::CompilationInfo::getStream())
#endif
{
TR_ASSERT_FATAL((_processorDescription.processor == p) == (self()->id() == self()->get_old_processor_type_from_new_processor_type(p)), "is test %d failed, id() %d, _processorDescription.processor %d", p, self()->id(), _processorDescription.processor);
}

return _processorDescription.processor == p;
}

bool
J9::Power::CPU::isAtLeast(OMRProcessorArchitecture p)
{
if (TR::Compiler->omrPortLib == NULL)
return self()->id() >= self()->get_old_processor_type_from_new_processor_type(p);

#if defined(J9VM_OPT_JITSERVER)
if (TR::CompilationInfo::getStream())
#endif
{
TR_ASSERT_FATAL((_processorDescription.processor >= p) == (self()->id() >= self()->get_old_processor_type_from_new_processor_type(p)), "is at least test %d failed, id() %d, _processorDescription.processor %d", p, self()->id(), _processorDescription.processor);
}

return _processorDescription.processor >= p;
}

bool
J9::Power::CPU::isAtMost(OMRProcessorArchitecture p)
{
if (TR::Compiler->omrPortLib == NULL)
return self()->id() <= self()->get_old_processor_type_from_new_processor_type(p);

#if defined(J9VM_OPT_JITSERVER)
if (TR::CompilationInfo::getStream())
#endif
{
TR_ASSERT_FATAL((_processorDescription.processor <= p) == (self()->id() <= self()->get_old_processor_type_from_new_processor_type(p)), "is at most test %d failed, id() %d, _processorDescription.processor %d", p, self()->id(), _processorDescription.processor);
}

return _processorDescription.processor <= p;
}

Expand Down