Skip to content

Update Makefile to Keystone-v1.0.0 compatibility #2

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

Open
C4-S3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Makefile to Keystone-v1.0.0 compatibility #2

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: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ all: bench-runner coremark rv8-bench eyrie-rt
./copy_all_tests.sh

coremark:
make -C ./coremark/ CC=riscv64-unknown-linux-gnu-gcc link
make -C ./coremark/ CC=riscv64-unknown-linux-musl-gcc link
rv8-bench:
make -C ./rv8-bench/
bench-runner:
make -C ./bench-runner/
eyrie-rt:
${KEYSTONE_DIR}/sdk/rts/eyrie/build.sh freemem untrusted_io_syscall env_setup linux_syscall
${KEYSTONE_DIR}/keystone-runtime/build.sh freemem untrusted_io_syscall env_setup linux_syscall
clean:
make -C ./rv8-bench clean
make -C ./coremark clean
Expand Down
12 changes: 7 additions & 5 deletions bench-runner/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
CC = riscv64-unknown-linux-gnu-g++
OBJCOPY = riscv64-unknown-linux-gnu-objcopy

SDK_LIB_DIR =$(KEYSTONE_DIR)/sdk/lib
SDK_LIB_DIR =$(KEYSTONE_DIR)/sdk/build64/lib
SDK_HOST_LIB = $(SDK_LIB_DIR)/libkeystone-host.a
SDK_EDGE_LIB = $(SDK_LIB_DIR)/libkeystone-edge.a
SDK_VERIFIER_LIB = $(SDK_LIB_DIR)/libkeystone-verifier.a

SDK_INCLUDE_HOST_DIR = $(SDK_LIB_DIR)/host/include
SDK_INCLUDE_EDGE_DIR = $(SDK_LIB_DIR)/edge/include
SDK_INCLUDE_VERIFIER_DIR = $(SDK_LIB_DIR)/verifier
SDK_INCLUDE_HOST_DIR = $(KEYSTONE_DIR)/sdk/build64/include/host
SDK_INCLUDE_EDGE_DIR = $(KEYSTONE_DIR)/sdk/build64/include/edge
SDK_INCLUDE_VERIFIER_DIR = $(KEYSTONE_DIR)/sdk/build64/include/verifier
SDK_INCLUDE_COMMON_DIR = $(KEYSTONE_DIR)/sdk/build64/include
SDK_INCLUDE_APP_DIR = $(KEYSTONE_DIR)/sdk/build64/include/app


RUNNER=bench-runner.riscv
CCFLAGS = -I$(SDK_INCLUDE_HOST_DIR) -I$(SDK_INCLUDE_EDGE_DIR) -I$(SDK_INCLUDE_VERIFIER_DIR) -std=c++11
CCFLAGS = -I$(SDK_INCLUDE_HOST_DIR) -I$(SDK_INCLUDE_EDGE_DIR) -I$(SDK_INCLUDE_VERIFIER_DIR) -I$(SDK_INCLUDE_COMMON_DIR) -std=c++11
LDFLAGS = -L$(SDK_LIB_DIR)

SRCS = $(patsubst %.riscv, %.cpp, $(RUNNER))
Expand Down
4 changes: 2 additions & 2 deletions bench-runner/bench-runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ int main(int argc, char** argv)
}
}

Keystone enclave;
Params params;
Keystone::Enclave enclave;
Keystone::Params params;
unsigned long cycles1,cycles2,cycles3,cycles4;

params.setFreeMemSize(freemem_size);
Expand Down
2 changes: 1 addition & 1 deletion copy_all_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

KEYSTONE_BINS_DIR=${KEYSTONE_DIR}/sdk/rts/eyrie/
KEYSTONE_BINS_DIR=${KEYSTONE_DIR}/keystone-runtime

source test_config.sh

Expand Down