diff --git a/perf/.gitignore b/perf/.gitignore
new file mode 100644
index 000000000..a98849924
--- /dev/null
+++ b/perf/.gitignore
@@ -0,0 +1 @@
+**/*.log
diff --git a/runtime/common/scope.cpp b/runtime/common/scope.cpp
index 2599c936a..d478a6311 100644
--- a/runtime/common/scope.cpp
+++ b/runtime/common/scope.cpp
@@ -335,7 +335,6 @@ int vx_scope_stop(vx_device_h hdevice) {
         if (tap == nullptr)
             break;
         // advance clock
-        printf("*** dump tap: id=%d, start_time=%ld, cur_time=%ld\n", tap->id, tap->cycle_time, cur_time);
         cur_time = advance_time(ofs, tap->cycle_time, cur_time);        
         // dump tap
         CHECK_ERR(dump_tap(ofs, tap, hdevice));
diff --git a/tests/.gitignore b/tests/.gitignore
index d977f4652..a98849924 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1 @@
-**/.run
+**/*.log
diff --git a/tests/opencl/common.mk b/tests/opencl/common.mk
index 84e228213..d3c045c93 100644
--- a/tests/opencl/common.mk
+++ b/tests/opencl/common.mk
@@ -1,20 +1,22 @@
 XLEN ?= 32
 
-TARGET   ?= hw_emu
-PLATFORM ?= xilinx_u280_xdma_201920_3
+TARGET ?= opaesim
 
 XRT_SYN_DIR  ?= ../../../hw/syn/xilinx/xrt
-FPGA_BIN_DIR ?= $(XRT_SYN_DIR)/build_$(PLATFORM)_$(TARGET)/bin
 
-LLVM_VORTEX ?= /opt/llvm-vortex
 RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain
 SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
+
 POCL_CC_PATH ?= /opt/pocl/compiler
 POCL_RT_PATH ?= /opt/pocl/runtime
 
 VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 VORTEX_KN_PATH ?= $(realpath ../../../kernel)
 
+FPGA_BIN_DIR ?= $(VORTEX_RT_PATH)/opae
+
+LLVM_VORTEX ?= /opt/llvm-vortex
+
 K_LLCFLAGS += -O3 -march=riscv32 -target-abi=ilp32f -mcpu=generic-rv32 -mattr=+m,+f,+vortex -float-abi=hard -code-model=small
 K_CFLAGS   += -v -Os --sysroot=$(SYSROOT) --gcc-toolchain=$(RISCV_TOOLCHAIN_PATH) -march=rv32imf -mabi=ilp32f -Xclang -target-feature -Xclang +vortex
 K_CFLAGS   += -fno-rtti -fno-exceptions -nostartfiles -fdata-sections -ffunction-sections
@@ -34,12 +36,6 @@ else
 	CXXFLAGS += -O2 -DNDEBUG
 endif
 
-ifeq ($(TARGET), opaesim)
-	SCOPE_JSON_PATH ?= $(VORTEX_RT_PATH)/opae/scope.json
-else
-	SCOPE_JSON_PATH ?= $(FPGA_BIN_DIR)/scope.json
-endif
-
 ifeq ($(TARGET), fpga)
 	OPAE_DRV_PATHS ?= libopae-c.so
 else
@@ -67,11 +63,11 @@ run-rtlsim: $(PROJECT) kernel.pocl
 	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_RT_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
 run-opae: $(PROJECT) kernel.pocl
-	OPAE_DRV_PATHS=$(OPAE_DRV_PATHS) SCOPE_JSON_PATH=$(SCOPE_JSON_PATH) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_RT_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	SCOPE_JSON_PATH=$(FPGA_BIN_DIR)/scope.json OPAE_DRV_PATHS=$(OPAE_DRV_PATHS) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_RT_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
 run-xrt: $(PROJECT) kernel.pocl
 ifeq ($(TARGET), hw)
-	XRT_INI_PATH=$(XRT_SYN_DIR)/xrt.ini EMCONFIG_PATH=$(FPGA_BIN_DIR) XRT_DEVICE_INDEX=0 XRT_XCLBIN_PATH=$(FPGA_BIN_DIR)/vortex_afu.xclbin LD_LIBRARY_PATH=$(XILINX_XRT)/lib:$(POCL_RT_PATH)/lib:$(VORTEX_RT_PATH)/xrt:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	SCOPE_JSON_PATH=$(FPGA_BIN_DIR)/scope.json XRT_INI_PATH=$(XRT_SYN_DIR)/xrt.ini EMCONFIG_PATH=$(FPGA_BIN_DIR) XRT_DEVICE_INDEX=0 XRT_XCLBIN_PATH=$(FPGA_BIN_DIR)/vortex_afu.xclbin LD_LIBRARY_PATH=$(XILINX_XRT)/lib:$(POCL_RT_PATH)/lib:$(VORTEX_RT_PATH)/xrt:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 else
 	XCL_EMULATION_MODE=$(TARGET) XRT_INI_PATH=$(XRT_SYN_DIR)/xrt.ini EMCONFIG_PATH=$(FPGA_BIN_DIR) XRT_DEVICE_INDEX=0 XRT_XCLBIN_PATH=$(FPGA_BIN_DIR)/vortex_afu.xclbin LD_LIBRARY_PATH=$(XILINX_XRT)/lib:$(POCL_RT_PATH)/lib:$(VORTEX_RT_PATH)/xrt:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)	
 endif
diff --git a/tests/regression/common.mk b/tests/regression/common.mk
index a8e9a5d21..6f4298546 100644
--- a/tests/regression/common.mk
+++ b/tests/regression/common.mk
@@ -1,16 +1,16 @@
 XLEN ?= 32
 
-TARGET   ?= hw_emu
-PLATFORM ?= xilinx_u280_xdma_201920_3
+TARGET ?= opaesim
 
 XRT_SYN_DIR  ?= ../../../hw/syn/xilinx/xrt
-FPGA_BIN_DIR ?= $(XRT_SYN_DIR)/build_$(PLATFORM)_$(TARGET)/bin
 
 RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain
 
 VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 VORTEX_KN_PATH ?= $(realpath ../../../kernel)
 
+FPGA_BIN_DIR ?= $(VORTEX_RT_PATH)/opae
+
 LLVM_VORTEX ?= /opt/llvm-vortex
 
 LLVM_CFLAGS += --sysroot=$(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
@@ -53,12 +53,6 @@ else
 	CXXFLAGS += -O2 -DNDEBUG
 endif
 
-ifeq ($(TARGET), opaesim)
-	SCOPE_JSON_PATH ?= $(VORTEX_RT_PATH)/opae/scope.json
-else
-	SCOPE_JSON_PATH ?= $(FPGA_BIN_DIR)/scope.json
-endif
-
 ifeq ($(TARGET), fpga)
 	OPAE_DRV_PATHS ?= libopae-c.so
 else
@@ -89,14 +83,14 @@ run-simx: $(PROJECT) kernel.bin
 	LD_LIBRARY_PATH=$(VORTEX_RT_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 	
 run-opae: $(PROJECT) kernel.bin   
-	OPAE_DRV_PATHS=$(OPAE_DRV_PATHS) SCOPE_JSON_PATH=$(SCOPE_JSON_PATH) LD_LIBRARY_PATH=$(HOME)/dev/netlist-paths/release/install/lib:$(VORTEX_RT_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	SCOPE_JSON_PATH=$(FPGA_BIN_DIR)/scope.json OPAE_DRV_PATHS=$(OPAE_DRV_PATHS) LD_LIBRARY_PATH=$(HOME)/dev/netlist-paths/release/install/lib:$(VORTEX_RT_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
 run-rtlsim: $(PROJECT) kernel.bin   
 	LD_LIBRARY_PATH=$(VORTEX_RT_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
 run-xrt: $(PROJECT) kernel.bin
 ifeq ($(TARGET), hw)
-	XRT_INI_PATH=$(XRT_SYN_DIR)/xrt.ini EMCONFIG_PATH=$(FPGA_BIN_DIR) XRT_DEVICE_INDEX=0 XRT_XCLBIN_PATH=$(FPGA_BIN_DIR)/vortex_afu.xclbin LD_LIBRARY_PATH=$(XILINX_XRT)/lib:$(VORTEX_RT_PATH)/xrt:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	SCOPE_JSON_PATH=$(FPGA_BIN_DIR)/scope.json XRT_INI_PATH=$(XRT_SYN_DIR)/xrt.ini EMCONFIG_PATH=$(FPGA_BIN_DIR) XRT_DEVICE_INDEX=0 XRT_XCLBIN_PATH=$(FPGA_BIN_DIR)/vortex_afu.xclbin LD_LIBRARY_PATH=$(XILINX_XRT)/lib:$(VORTEX_RT_PATH)/xrt:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 else
 	XCL_EMULATION_MODE=$(TARGET) XRT_INI_PATH=$(XRT_SYN_DIR)/xrt.ini EMCONFIG_PATH=$(FPGA_BIN_DIR) XRT_DEVICE_INDEX=0 XRT_XCLBIN_PATH=$(FPGA_BIN_DIR)/vortex_afu.xclbin LD_LIBRARY_PATH=$(XILINX_XRT)/lib:$(VORTEX_RT_PATH)/xrt:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)	
 endif