From 9018dd60c63cbbe294a7cd45d87592e103cf1783 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 21 May 2019 04:46:47 -0700 Subject: [PATCH] examples: rename ioat perf tool to ioat_perf This avoids conflict with the nvme perf tool. PGO gets confused during building - we may have data for nvme/perf which it then tries to use when building ioat/perf. Renaming the ioat perf tool fixes that problem. Signed-off-by: Jim Harris Change-Id: Ib1084d56d671e44027ea05f453075a723f067580 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455320 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto --- examples/ioat/perf/.gitignore | 2 +- examples/ioat/perf/Makefile | 2 +- examples/ioat/perf/perf.c | 2 +- test/ioat/ioat.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/ioat/perf/.gitignore b/examples/ioat/perf/.gitignore index bd14107d8..60abaee49 100644 --- a/examples/ioat/perf/.gitignore +++ b/examples/ioat/perf/.gitignore @@ -1 +1 @@ -perf +ioat_perf diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile index 44eb752d4..5586b8120 100644 --- a/examples/ioat/perf/Makefile +++ b/examples/ioat/perf/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -APP = perf +APP = ioat_perf C_SRCS := perf.c diff --git a/examples/ioat/perf/perf.c b/examples/ioat/perf/perf.c index 55f74d5a6..976743817 100644 --- a/examples/ioat/perf/perf.c +++ b/examples/ioat/perf/perf.c @@ -400,7 +400,7 @@ init(void) struct spdk_env_opts opts; spdk_env_opts_init(&opts); - opts.name = "perf"; + opts.name = "ioat_perf"; opts.core_mask = g_user_config.core_mask; if (spdk_env_init(&opts) < 0) { return -1; diff --git a/test/ioat/ioat.sh b/test/ioat/ioat.sh index b15f635e8..afc76599d 100755 --- a/test/ioat/ioat.sh +++ b/test/ioat/ioat.sh @@ -9,7 +9,7 @@ source $rootdir/test/common/autotest_common.sh timing_enter ioat timing_enter perf -$rootdir/examples/ioat/perf/perf -t 1 +$rootdir/examples/ioat/perf/ioat_perf -t 1 timing_exit perf timing_enter verify