[llvm-mca] Fixed a problem caused by an invalid use of a processor resource mask in the Scheduler.
The lambda functions used by method ResourceManager::mustIssueImmediately() was
incorrectly truncating masks of buffered processor resources to 32-bit quantities.
The invalid mask values were then used to access a map of processor
resource descriptors.
Fixes PR37643.
llvm-svn: 333692
diff --git a/llvm/tools/llvm-mca/Scheduler.cpp b/llvm/tools/llvm-mca/Scheduler.cpp
index 56dc746..2782bac 100644
--- a/llvm/tools/llvm-mca/Scheduler.cpp
+++ b/llvm/tools/llvm-mca/Scheduler.cpp
@@ -164,18 +164,16 @@
bool ResourceManager::mustIssueImmediately(const InstrDesc &Desc) {
if (!canBeIssued(Desc))
return false;
- bool AllInOrderResources = std::all_of(
- Desc.Buffers.begin(), Desc.Buffers.end(), [&](const unsigned BufferMask) {
- const ResourceState &Resource = *Resources[BufferMask];
- return Resource.isInOrder() || Resource.isADispatchHazard();
- });
+ bool AllInOrderResources = all_of(Desc.Buffers, [&](uint64_t BufferMask) {
+ const ResourceState &Resource = *Resources[BufferMask];
+ return Resource.isInOrder() || Resource.isADispatchHazard();
+ });
if (!AllInOrderResources)
return false;
- return std::any_of(Desc.Buffers.begin(), Desc.Buffers.end(),
- [&](const unsigned BufferMask) {
- return Resources[BufferMask]->isADispatchHazard();
- });
+ return any_of(Desc.Buffers, [&](uint64_t BufferMask) {
+ return Resources[BufferMask]->isADispatchHazard();
+ });
}
void ResourceManager::issueInstruction(