Skip to content

Commit

Permalink
lib: remove AVX Type 2 implementation
Browse files Browse the repository at this point in the history
Signed-off-by: Pablo de Lara <[email protected]>
  • Loading branch information
pablodelara authored and mdcornu committed Sep 26, 2024
1 parent ac294a9 commit 28d33da
Show file tree
Hide file tree
Showing 11 changed files with 185 additions and 753 deletions.
1 change: 1 addition & 0 deletions ReleaseNotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Library
- SHA-384 AVX2-SHA384-NI x2 implementation added.
- AES-CFB SSE and VAES AVX512 implementation added.
- Removed AESNI emulation support
- Removed AVX Type 2 implementation.

Test Applications
- Removed Makefile support
Expand Down
1 change: 0 additions & 1 deletion lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ set(CAN_USE_ASSEMBLER 1)
set(DIR_CURRENT ${CMAKE_CURRENT_SOURCE_DIR}/)
set(DIR_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
set(DIR_AVX_T1 ${CMAKE_CURRENT_SOURCE_DIR}/avx_t1)
set(DIR_AVX_T2 ${CMAKE_CURRENT_SOURCE_DIR}/avx_t2)
set(DIR_AVX2_T1 ${CMAKE_CURRENT_SOURCE_DIR}/avx2_t1)
set(DIR_AVX2_T2 ${CMAKE_CURRENT_SOURCE_DIR}/avx2_t2)
set(DIR_AVX512_T1 ${CMAKE_CURRENT_SOURCE_DIR}/avx512_t1)
Expand Down
9 changes: 1 addition & 8 deletions lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ SAFE_OPTIONS_MSG2="All safe options enabled by default."
c_lib_objs := \
mb_mgr_avx.o \
mb_mgr_avx_t1.o \
mb_mgr_avx_t2.o \
mb_mgr_avx2.o \
mb_mgr_avx2_t1.o \
mb_mgr_avx2_t2.o \
Expand Down Expand Up @@ -877,12 +876,6 @@ $(OBJ_DIR)/%.o:avx_t1/%.c
$(OBJ_DIR)/%.o:avx_t1/%.asm
$(NASM) -MD $(@:.o=.d) -MT $@ -o $@ $(NASM_FLAGS) $<

$(OBJ_DIR)/%.o:avx_t2/%.c
$(CC) -MMD $(OPT_AVX) -c $(CFLAGS) $< -o $@

$(OBJ_DIR)/%.o:avx_t2/%.asm
$(NASM) -MD $(@:.o=.d) -MT $@ -o $@ $(NASM_FLAGS) $<

$(OBJ_DIR)/%.o:avx2_t1/%.c
$(CC) -MMD $(OPT_AVX2) -c $(CFLAGS) $< -o $@

Expand Down Expand Up @@ -1000,7 +993,7 @@ CHECKPATCH_FLAGS = --no-tree --no-signoff --emacs --no-color --max-line-length=1
%.inc_style_check : %.inc
$(CHECKPATCH) $(CHECKPATCH_FLAGS) -f $<

SOURCES_DIRS := . sse_t1 sse_t2 sse_t3 avx_t1 avx_t2 avx2_t1 avx_t2 avx2_t3 avx512_t1 avx512_t2 x86_64 include
SOURCES_DIRS := . sse_t1 sse_t2 sse_t3 avx_t1 avx2_t1 avx2_t2 avx2_t3 avx512_t1 avx512_t2 x86_64 include
ASM_SOURCES := $(foreach dir,$(SOURCES_DIRS), $(wildcard $(dir)/**/*.asm) $(wildcard $(dir)/**/*.inc))

.PHONY: checkpatch
Expand Down
5 changes: 1 addition & 4 deletions lib/avx_t1/mb_mgr_avx.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ init_mb_mgr_avx_internal(IMB_MGR *state, const int reset_mgrs)

state->features = cpu_feature_adjust(state->flags, cpu_feature_detect());

if ((state->features & IMB_CPUFLAGS_AVX_T2) == IMB_CPUFLAGS_AVX_T2)
init_mb_mgr_avx_t2_internal(state, reset_mgrs);
else
init_mb_mgr_avx_t1_internal(state, reset_mgrs);
init_mb_mgr_avx_t1_internal(state, reset_mgrs);
}

void
Expand Down
Loading

0 comments on commit 28d33da

Please sign in to comment.