Update WLS library dependencies#283
Conversation
| @@ -1,44 +1,11 @@ | |||
| diff --git a/wls_lib/Makefile b/wls_lib/Makefile | |||
| index 2f8e4b2..7b99a26 100644 | |||
| index 7b167a6..132043d 100644 | |||
There was a problem hiding this comment.
why do we need that patch at all? I suggest you open a PR on https://github.com/openairinterface/o-du-phy/
There was a problem hiding this comment.
The patch is to install the WLS headers and library to the system, so that it can be easily found by find_library in nfapi/oai_integration/wls_integration/CMakeLists.txt without having extra parameters on build_oai
There was a problem hiding this comment.
I know. but we can integrate the patch it into our fork. If a user clones that, there is no need to apply this patch anymore.
please open a PR there
There was a problem hiding this comment.
I opened the PR, I'll remove the patch then.
#5
| - TARGET_PROCESSOR := -xCORE-AVX2 | ||
| -else ifeq ($(WIRELESS_SDK_TARGET_ISA),avx512) | ||
| + ifeq ($(WIRELESS_SDK_TARGET_ISA),sse) | ||
| + TARGET_PROCESSOR := -xSSE4.2 |
There was a problem hiding this comment.
that seems wrong, it's maybe also -mXXX
There was a problem hiding this comment.
This came from the original patch, I'll test reverting all changes except the addition of the installation part, and the search for DPDK, I still think that one's useful.
There was a problem hiding this comment.
I cleaned the Makefile changes and opened a PR, mentioned above
|
|
||
| The WLS library has a few dependencies: | ||
| - [DPDK](https://doc.dpdk.org/guides/prog_guide/build-sdk-meson.html), specifically version [20.11.3](https://fast.dpdk.org/rel/dpdk-20.11.3.tar.xz). | ||
| - [DPDK](https://doc.dpdk.org/guides/prog_guide/build-sdk-meson.html) Currently using DPDK version [22.11.11](http://fast.dpdk.org/rel/dpdk-22.11.11.tar.xz). |
There was a problem hiding this comment.
| - [DPDK](https://doc.dpdk.org/guides/prog_guide/build-sdk-meson.html) Currently using DPDK version [22.11.11](http://fast.dpdk.org/rel/dpdk-22.11.11.tar.xz). | |
| - [DPDK](https://doc.dpdk.org/guides/prog_guide/build-sdk-meson.html) in version [22.11.11](http://fast.dpdk.org/rel/dpdk-22.11.11.tar.xz). |
not sure what "Currently" means, likely a somewhat newer is fine as well?!
There was a problem hiding this comment.
Looking back, yes, it's a bit misleading, I'll change it
| #define WLS_DEV_NAME "wls" | ||
| #define WLS_MAC_MEMORY_SIZE 0x7F000000 | ||
| #define WLS_PHY_MEMORY_SIZE 0x7F000000 | ||
| #define WLS_MAC_MEMORY_SIZE 0x18000000 |
There was a problem hiding this comment.
why these changes, can you please comment? could you please note that in the commit message?
There was a problem hiding this comment.
These changes were needed because I was encountering multiple failures in allocating the WLS memory while testing with the new version, errors that I didn't find with the previous version, I'll test tweaking the values closer to the original ones to see how close I can get them.
There was a problem hiding this comment.
I was able to tweak the values up to 0x3F000000
| #define WLS_PHY_MEMORY_SIZE 0x7F000000 | ||
| #define WLS_MAC_MEMORY_SIZE 0x18000000 | ||
| #define WLS_PHY_MEMORY_SIZE 0x18000000 | ||
| #define WLS_UL_ENQUEUE_SIZE 0 |
There was a problem hiding this comment.
unqueue size of 0 looks suspicious, please add a comment on why
There was a problem hiding this comment.
It was done to keep in line with the testapp.c present in the wls repository, setting it to 0 makes it internally allocate the maximum.
In wls_lib_dpdk.c:
if (nWlsULEnqueueSize == 0)
{
pWlsDrvCtx->nWlsULEnqueueSize = UL_FREE_BLOCK_QUEUE_SIZE_MAX;
}
I'll add a comment stating this.
eb8b38f to
ba68c6a
Compare
…se K. Signed-off-by: Rúben Soares Silva <rsilva@allbesmart.pt>
ba68c6a to
32caf08
Compare
This PR aims to upgrade the used WLS library and dependencies to align with Release K , following the drop of support for Release F previously used PR #259.
This was tested locally after installing the new DPDK version and WLS library according to ORAN_FHI7.2_Tutorial.md and nfapi.md.