[OpenMP][MLIR] Fix llvm::sort comparator. #91947
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir-openmp @llvm/pr-subscribers-mlir Author: Oleg Shyshkov (olegshyshkov) Changesllvm::sort requires the comparator to return Full diff: https://github.com/llvm/llvm-project/pull/91947.diff 1 Files Affected:
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 0c34126667324..282e640d3aaad 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -2175,10 +2175,10 @@ getFirstOrLastMappedMemberPtr(mlir::omp::MapInfoOp mapInfo, bool first) {
return !first;
}
- // iterated the entire list and couldn't make a decision, all elements
- // were likely the same, return true for now similar to reaching the end
- // of both and finding invalid indices.
- return true;
+ // Iterated the entire list and couldn't make a decision, all elements
+ // were likely the same. Return false, since the sort comparator should
+ // return false for equal elements.
+ return false;
});
return llvm::cast<mlir::omp::MapInfoOp>(
|
|
@llvm/pr-subscribers-mlir-llvm Author: Oleg Shyshkov (olegshyshkov) Changesllvm::sort requires the comparator to return Full diff: https://github.com/llvm/llvm-project/pull/91947.diff 1 Files Affected:
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 0c34126667324..282e640d3aaad 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -2175,10 +2175,10 @@ getFirstOrLastMappedMemberPtr(mlir::omp::MapInfoOp mapInfo, bool first) {
return !first;
}
- // iterated the entire list and couldn't make a decision, all elements
- // were likely the same, return true for now similar to reaching the end
- // of both and finding invalid indices.
- return true;
+ // Iterated the entire list and couldn't make a decision, all elements
+ // were likely the same. Return false, since the sort comparator should
+ // return false for equal elements.
+ return false;
});
return llvm::cast<mlir::omp::MapInfoOp>(
|
akuegel
approved these changes
May 13, 2024
llvm::sort requres the comparator to return `false` for equal elements, otherwise it triggers `Your comparator is not a valid strict-weak ordering` assert.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
llvm::sort requires the comparator to return
falsefor equal elements, otherwise it triggersYour comparator is not a valid strict-weak orderingassert.