Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PATCH v2] linux-gen: sched: remove scalable scheduler implementation #2162

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/ci-pipeline-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,17 +266,6 @@ jobs:
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_scheduler_scalable:
if: ${{ github.repository == 'OpenDataPlane/odp' }}
runs-on: ah-ubuntu_22_04-c7g_2x-50
steps:
- uses: OpenDataPlane/action-clean-up@main
- uses: actions/checkout@v4
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" -e ODP_SCHEDULER=scalable -e CI_SKIP=pktio_test_pktin_event_sched $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_process_mode:
if: ${{ github.repository == 'OpenDataPlane/odp' }}
runs-on: ah-ubuntu_22_04-c7g_2x-50
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/ci-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,15 +348,6 @@ jobs:
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_scheduler_scalable:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" -e ODP_SCHEDULER=scalable -e CI_SKIP=pktio_test_pktin_event_sched $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/check.sh
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_process_mode:
runs-on: ubuntu-22.04
steps:
Expand Down
26 changes: 5 additions & 21 deletions platform/linux-generic/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ endif

noinst_HEADERS = \
include/odp_atomic_internal.h \
include/odp_bitset.h \
include/odp_buffer_internal.h \
include/odp_chksum_internal.h \
include/odp_classification_datamodel.h \
Expand All @@ -147,9 +146,7 @@ noinst_HEADERS = \
include/odp_init_internal.h \
include/odp_ipsec_internal.h \
include/odp_ishmphy_internal.h \
include/odp_ishmpool_internal.h \
include/odp_libconfig_internal.h \
include/odp_llqueue.h \
include/odp_macros_internal.h \
include/odp_name_table_internal.h \
include/odp_packet_dpdk.h \
Expand All @@ -170,7 +167,6 @@ noinst_HEADERS = \
include/odp_queue_if.h \
include/odp_queue_basic_internal.h \
include/odp_queue_lf.h \
include/odp_queue_scalable_internal.h \
include/odp_random_std_internal.h \
include/odp_random_openssl_internal.h \
include/odp_ring_common.h \
Expand All @@ -184,9 +180,6 @@ noinst_HEADERS = \
include/odp_ring_u32_internal.h \
include/odp_ring_u64_internal.h \
include/odp_schedule_if.h \
include/odp_schedule_scalable_config.h \
include/odp_schedule_scalable.h \
include/odp_schedule_scalable_ordered.h \
include/odp_shm_internal.h \
include/odp_sorted_list_internal.h \
include/odp_sysinfo_internal.h \
Expand Down Expand Up @@ -230,7 +223,6 @@ __LIB__libodp_linux_la_SOURCES = \
odp_ipsec_sad.c \
odp_ishm.c \
odp_ishmphy.c \
odp_ishmpool.c \
odp_libconfig.c \
odp_ml_fp16.c \
odp_ml_quantize.c \
Expand All @@ -246,15 +238,12 @@ __LIB__libodp_linux_la_SOURCES = \
odp_queue_basic.c \
odp_queue_if.c \
odp_queue_lf.c \
odp_queue_scalable.c \
odp_queue_spsc.c \
odp_random.c \
odp_random_std.c \
odp_random_openssl.c \
odp_schedule_basic.c \
odp_schedule_if.c \
odp_schedule_scalable.c \
odp_schedule_scalable_ordered.c \
odp_schedule_sp.c \
odp_shared_memory.c \
odp_sorted_list.c \
Expand Down Expand Up @@ -363,8 +352,7 @@ endif
noinst_HEADERS += arch/arm/odp_cpu.h \
arch/default/odp_atomic.h \
arch/default/odp_cpu.h \
arch/default/odp_random.h \
arch/default/odp_wait_until.h
arch/default/odp_random.h
endif
if ARCH_IS_AARCH64
__LIB__libodp_linux_la_SOURCES += arch/aarch64/odp_atomic.c \
Expand Down Expand Up @@ -392,8 +380,7 @@ endif
noinst_HEADERS += arch/aarch64/odp_atomic.h \
arch/aarch64/odp_cpu.h \
arch/aarch64/cpu_flags.h \
arch/aarch64/odp_random.h \
arch/aarch64/odp_wait_until.h
arch/aarch64/odp_random.h
endif
if ARCH_IS_DEFAULT
__LIB__libodp_linux_la_SOURCES += arch/default/odp_atomic.c \
Expand All @@ -416,8 +403,7 @@ odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/atomic_generic.h \
endif
noinst_HEADERS += arch/default/odp_atomic.h \
arch/default/odp_cpu.h \
arch/default/odp_random.h \
arch/default/odp_wait_until.h
arch/default/odp_random.h
endif
if ARCH_IS_POWERPC
__LIB__libodp_linux_la_SOURCES += arch/default/odp_atomic.c \
Expand All @@ -440,8 +426,7 @@ odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/atomic_generic.h \
endif
noinst_HEADERS += arch/default/odp_atomic.h \
arch/default/odp_cpu.h \
arch/default/odp_random.h \
arch/default/odp_wait_until.h
arch/default/odp_random.h
endif
if ARCH_IS_X86
__LIB__libodp_linux_la_SOURCES += arch/default/odp_atomic.c \
Expand Down Expand Up @@ -470,8 +455,7 @@ noinst_HEADERS += arch/x86/cpu_flags.h \
arch/x86/odp_cpu.h \
arch/x86/odp_random.h \
arch/default/odp_atomic.h \
arch/default/odp_cpu.h \
arch/default/odp_wait_until.h
arch/default/odp_cpu.h
endif

if ODP_PKTIO_PCAP
Expand Down
8 changes: 0 additions & 8 deletions platform/linux-generic/arch/aarch64/odp_cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
#include <odp_debug_internal.h>
#include <odp_types_internal.h>

/*
* Use LLD/SCD atomic primitives instead of lock-based code path in llqueue
* LLD/SCD is on ARM the fastest way to enqueue and dequeue elements from a
* linked list queue.
*/
#define CONFIG_LLDSCD

/*
* Use DMB;STR instead of STRL on ARM
* On early ARMv8 implementations (e.g. Cortex-A57) this is noticeably more
Expand Down Expand Up @@ -188,7 +181,6 @@ static inline uint32_t scd(_odp_u128_t *var, _odp_u128_t neu, int mm)
}

#include "odp_atomic.h"
#include "odp_wait_until.h"

#ifdef __ARM_FEATURE_UNALIGNED
#define _ODP_UNALIGNED 1
Expand Down
100 changes: 0 additions & 100 deletions platform/linux-generic/arch/aarch64/odp_wait_until.h

This file was deleted.

8 changes: 0 additions & 8 deletions platform/linux-generic/arch/arm/odp_cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@

#include <odp_debug_internal.h>

/*
* Use LLD/SCD atomic primitives instead of lock-based code path in llqueue
* LLD/SCD is on ARM the fastest way to enqueue and dequeue elements from a
* linked list queue.
*/
#define CONFIG_LLDSCD

/*
* Use DMB;STR instead of STRL on ARM
* On early ARMv8 implementations (e.g. Cortex-A57) this is noticeably more
Expand Down Expand Up @@ -73,7 +66,6 @@ do { \
#endif /* CONFIG_DMBSTR */

#include "../default/odp_atomic.h"
#include "../default/odp_wait_until.h"

#ifdef __ARM_FEATURE_UNALIGNED
#define _ODP_UNALIGNED 1
Expand Down
1 change: 0 additions & 1 deletion platform/linux-generic/arch/default/odp_cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@
__atomic_store_n(loc, val, __ATOMIC_RELEASE)

#include "odp_atomic.h"
#include "odp_wait_until.h"

#endif
53 changes: 0 additions & 53 deletions platform/linux-generic/arch/default/odp_wait_until.h

This file was deleted.

Loading