-
Notifications
You must be signed in to change notification settings - Fork 741
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
devel/onetbb: Integrate patch from previous commit 1daf680
to avoid fetch problems. PR: 257220 Reported by: mandree
- Loading branch information
Showing
3 changed files
with
30 additions
and
5 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
TIMESTAMP = 1626043027 | ||
SHA256 (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e | ||
SIZE (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 1651329 | ||
SHA256 (fa944e19600500863507ed8e9b1f5a30037d9df6.patch) = a7c4dfdcf6794019d1f4d247cf669e9b8ef4511eb6d254eeca038b82de41334d | ||
SIZE (fa944e19600500863507ed8e9b1f5a30037d9df6.patch) = 1467 |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
Backport fa944e19600500863507ed8e9b1f5a30037d9df6 | ||
|
||
--- src/tbbmalloc/frontend.cpp.orig 2021-06-30 08:19:55 UTC | ||
+++ src/tbbmalloc/frontend.cpp | ||
@@ -802,21 +802,15 @@ static inline unsigned int highestBitPos(unsigned int | ||
return pos; | ||
} | ||
|
||
- | ||
-#if __TBB_x86_32 || __aarch32__ | ||
unsigned int getSmallObjectIndex(unsigned int size) | ||
{ | ||
- return (size-1)>>3; | ||
-} | ||
-#elif __TBB_x86_64 || __aarch64__ | ||
-unsigned int getSmallObjectIndex(unsigned int size) | ||
-{ | ||
- // For 64-bit malloc, 16 byte alignment is needed except for bin 0. | ||
unsigned int result = (size-1)>>3; | ||
- if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes | ||
+ if (sizeof(void*)==8) { | ||
+ // For 64-bit malloc, 16 byte alignment is needed except for bin 0. | ||
+ if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes | ||
+ } | ||
return result; | ||
} | ||
-#endif // __TBB_x86_32 || __aarch32__ | ||
|
||
/* | ||
* Depending on indexRequest, for a given size return either the index into the bin |