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.

Sign up for GitHub

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

libteec: drop benchmark framework support #373

Merged
merged 1 commit into from
Jan 23, 2024
Merged

libteec: drop benchmark framework support #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ LOCAL_CFLAGS += -DBINARY_PREFIX=\"TEEC\"

LOCAL_SRC_FILES := libteec/src/tee_client_api.c \
libteec/src/teec_trace.c
ifeq ($(CFG_TEE_BENCHMARK),y)
LOCAL_CFLAGS += -DCFG_TEE_BENCHMARK
LOCAL_SRC_FILES += teec_benchmark.c
endif

LOCAL_C_INCLUDES := $(LOCAL_PATH)/libteec/include

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ all: build install
build-libteec:
@echo "Building libteec.so"
@$(MAKE) --directory=libteec --no-print-directory --no-builtin-variables \
CFG_TEE_BENCHMARK=$(CFG_TEE_BENCHMARK) CFG_TEE_CLIENT_LOG_LEVEL=$(CFG_TEE_CLIENT_LOG_LEVEL)
CFG_TEE_CLIENT_LOG_LEVEL=$(CFG_TEE_CLIENT_LOG_LEVEL)

build-tee-supplicant: build-libteec
@echo "Building tee-supplicant"
Expand Down
13 changes: 0 additions & 13 deletions libteec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ endif()
################################################################################
# Configuration flags always included
################################################################################
option(CFG_TEE_BENCHMARK "Build with benchmark support" OFF)

set(CFG_TEE_CLIENT_LOG_LEVEL "1" CACHE STRING "libteec log level")
set(CFG_TEE_CLIENT_LOG_FILE "/data/tee/teec.log" CACHE STRING "Location of libteec log")

Expand All @@ -26,10 +24,6 @@ set(SRC
src/teec_trace.c
)

if(CFG_TEE_BENCHMARK)
set(SRC ${SRC} src/teec_benchmark.c)
endif()

################################################################################
# Built library
################################################################################
Expand All @@ -53,13 +47,6 @@ target_compile_definitions(teec
PRIVATE -DBINARY_PREFIX="LT"
)

################################################################################
# Optional flags
################################################################################
if(CFG_TEE_BENCHMARK)
target_compile_definitions(teec PRIVATE -DCFG_TEE_BENCHMARK)
endif()

################################################################################
# Public and private header and library dependencies
################################################################################
Expand Down
7 changes: 0 additions & 7 deletions libteec/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ LIB_MAJ_MIN_P := $(LIB_NAME).$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)

TEEC_SRCS := tee_client_api.c \
teec_trace.c
ifeq ($(CFG_TEE_BENCHMARK),y)
TEEC_SRCS += teec_benchmark.c
endif

TEEC_SRC_DIR := src
TEEC_OBJ_DIR := $(OUT_DIR)
Expand All @@ -34,10 +31,6 @@ TEEC_CFLAGS := $(addprefix -I, $(TEEC_INCLUDES)) $(CFLAGS) -D_GNU_SOURCE \
-DDEBUGLEVEL_$(CFG_TEE_CLIENT_LOG_LEVEL) \
-DBINARY_PREFIX=\"TEEC\"

ifeq ($(CFG_TEE_BENCHMARK),y)
TEEC_CFLAGS += -DCFG_TEE_BENCHMARK
endif

TEEC_LFLAGS := $(LDFLAGS) -lpthread
TEEC_LIBRARY := $(OUT_DIR)/$(LIB_MAJ_MIN_P)

Expand Down
77 changes: 0 additions & 77 deletions libteec/include/tee_bench.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions libteec/src/tee_client_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
#endif
#include <linux/tee.h>

#include "teec_benchmark.h"

#define MIN(x, y) (((x) < (y)) ? (x) : (y))

/* How many device sequence numbers will be tried before giving up */
Expand Down Expand Up @@ -705,8 +703,6 @@ TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
goto out;
}

bm_timestamp();

buf_data.buf_ptr = (uintptr_t)&buf;
buf_data.buf_len = sizeof(buf);

Expand Down Expand Up @@ -741,8 +737,6 @@ TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
eorig = arg->ret_origin;
teec_post_process_operation(operation, params, shm);

bm_timestamp();

out_free_temp_refs:
teec_free_temp_refs(operation, shm);
out:
Expand Down
Loading