fix: Detection of HW caps and Num Cpus for FreeBSD(R) and OpenBSD(R)#1269
fix: Detection of HW caps and Num Cpus for FreeBSD(R) and OpenBSD(R)#1269Martinfx wants to merge 1 commit intoARM-software:mainfrom
Conversation
|
Hi @Martinfx , Can you sign-off your commit please. We forgot it in the last PR unfortunately. |
|
@Martinfx I also suggest the following commit and pull request title: fix: Detection of HW caps and Num Cpus for FreeBSD(R) and OpenBSD(R) |
d90184d to
97df729
Compare
ok. no problem. |
|
@Martinfx |
5e831a8 to
fad3d65
Compare
2d8057c to
bdadbf6
Compare
|
@gunes-arm |
|
Hi, @gunes-arm , it is ok ? |
20a4498 to
d9f0a9c
Compare
gunes-arm
left a comment
There was a problem hiding this comment.
I guess there is one more remaining comment to be addressed: https://github.com/ARM-software/ComputeLibrary/pull/1269/changes#r3044146937
Yes. I reacted for comment: The problem with aarch64 is here #1274. Is amd64 support? |
src/common/cpuinfo/CpuInfo.cpp
Outdated
There was a problem hiding this comment.
I think we're inconsistent here. This elif will be chosen instead of what you implemented below. Therefore, we have to change this as
#elif defined(__arm__) && (defined(__OpenBSD__) || defined(__FreeBSD__))
This is for 32-bit build paths.
The comment next to it should be the previous if statement, i.e.
/* if !defined(_WIN64) && !defined(BARE_METAL) && !defined(__APPLE__) && !defined(__OpenBSD__) &&
!defined(__FreeBSD__) && !defined(__QNX__) && (defined(__arm__) || defined(__aarch64__)) */
src/common/cpuinfo/CpuInfo.cpp
Outdated
There was a problem hiding this comment.
Here, the comment should be previous elif, i.e.
/* #elif defined(__arm__) && (defined(__OpenBSD__) || defined(__FreeBSD__)) */
I replied in the issue. We do not support/test |
ok. thank you for response. |
Signed-off-by: Martin Filla <freebsd@sysctl.cz>
70853b4 to
e6ab46d
Compare
| #include <sys/types.h> | ||
| #include <unistd.h> | ||
| #endif /* #elif (defined(OpenBSD) || defined(FreeBSD)) && defined(aarch64) */ | ||
| #endif /* #elif (defined(__APPLE__)) && defined(__aarch64__) */ |
There was a problem hiding this comment.
I think this one is for the outer if, therefore:
/* !defined(_WIN64) */
| #include <sys/types.h> | ||
| #endif /* defined(__APPLE__) && defined(__aarch64__)) */ | ||
| #endif /* !defined(BARE_METAL) && !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__QNX__) && (defined(__arm__) || defined(__aarch64__)) */ | ||
| #elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__aarch64__) |
There was a problem hiding this comment.
This one should have /* #elif (defined(__APPLE__)) && defined(__aarch64__) */ next to it.
| #include <asm/hwcap.h> /* Get HWCAP bits from asm/hwcap.h */ | ||
| #include <sys/auxv.h> | ||
| #elif (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)) && defined(__aarch64__) | ||
| #elif (defined(__APPLE__)) && defined(__aarch64__) |
There was a problem hiding this comment.
This one should have
/* #if !defined(BARE_METAL) && !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && \
!defined(__QNX__) && (defined(__arm__) || defined(__aarch64__)) */
next to it.
Part of it was already wrong before, so, I'm sorry for that but since we touch it, it'd be good to correct them.
No description provided.