Skip to content
Snippets Groups Projects
Commit f7a70f6e authored by Peter Cai's avatar Peter Cai
Browse files

Revert "Support overriding CPU core location"

This reverts commit 30ca6df2.
parent 30ca6df2
No related branches found
No related tags found
No related merge requests found
perf_stat_start() {
local opt_args=""
if [ "$PERF_STAT_NO_CORES" != "true" ]; then
if [ ! -z "$OVERRIDE_CPUS" ]; then
opt_args="$opt_args -C $OVERRIDE_CPUS"
else
opt_args="$opt_args -C 0-$((THREADS - 1))"
fi
opt_args="$opt_args -C 0-$((THREADS - 1))"
fi
$PERF stat $PERF_EXTRA_ARGS $opt_args -e LLC-load-misses:u,LLC-load-misses:k,LLC-loads:u,LLC-loads:k,LLC-store-misses:u,LLC-store-misses:k,LLC-stores:u,LLC-stores:k,task-clock,cycles:u,cycles:k,instructions:u,instructions:k -o "$DATA_OUT/stat_$1$EXP_AUX_SUFFIX.txt" &
PERF_STAT_PID=$!
......@@ -18,11 +14,7 @@ perf_stat_stop() {
perf_record_start() {
local opt_args=""
if [ "$PERF_STAT_NO_CORES" != "true" ]; then
if [ ! -z "$OVERRIDE_CPUS" ]; then
opt_args="$opt_args -C $OVERRIDE_CPUS"
else
opt_args="$opt_args -C 0-$((THREADS - 1))"
fi
opt_args="$opt_args -C 0-$((THREADS - 1))"
fi
pushd "$DATA_OUT"
......
......@@ -28,12 +28,8 @@ cleanup_memcached() {
start_memcached() {
echo "Starting memcached"
local cpus="0-$((THREADS - 1 - THREAD_TAIL_OFFSET))"
if [ ! -z "$OVERRIDE_CPUS" ]; then
cpus="$OVERRIDE_CPUS"
fi
echo "taskset -c $OVERRIDE_CPUS $MEMCACHED $MEMCACHED_ARGS -u root -t $((THREADS - THREAD_TAIL_OFFSET)) -b 16384 -c 32768 -m 10240 -o hashpower=24,no_lru_maintainer,no_lru_crawler"
taskset -c $OVERRIDE_CPUS $MEMCACHED $MEMCACHED_ARGS -u root -t $((THREADS - THREAD_TAIL_OFFSET)) -b 16384 -c 32768 -m 10240 -o hashpower=24,no_lru_maintainer,no_lru_crawler &
echo "taskset -c 0-$((THREADS - 1 - THREAD_TAIL_OFFSET)) $MEMCACHED $MEMCACHED_ARGS -u root -t $((THREADS - THREAD_TAIL_OFFSET)) -b 16384 -c 32768 -m 10240 -o hashpower=24,no_lru_maintainer,no_lru_crawler"
taskset -c 0-$((THREADS - 1 - THREAD_TAIL_OFFSET)) $MEMCACHED $MEMCACHED_ARGS -u root -t $((THREADS - THREAD_TAIL_OFFSET)) -b 16384 -c 32768 -m 10240 -o hashpower=24,no_lru_maintainer,no_lru_crawler &
MEMCACHED_PID=$!
if [ "$PERF_STAT_ONLY_MEMCACHED" == "true" ]; then
PERF_EXTRA_ARGS_ORIG="$PERF_EXTRA_ARGS"
......
......@@ -38,11 +38,6 @@ while [[ $# -gt 0 ]]; do
shift
shift
;;
--override-cpus)
OVERRIDE_CPUS="$2"
shift
shift
;;
--fstack)
FSTACK=true
USERSTACK=true
......@@ -127,9 +122,6 @@ if [ "${#EXTRA_TUNING[@]}" -gt 0 ]; then
EXPERIMENT_NAME="$EXPERIMENT_NAME.$tuning"
done
fi
if [ ! -z "$OVERRIDE_CPUS" ]; then
EXPERIMENT_NAME="$EXPERIMENT_NAME.override_cpus$OVERRIDE_CPUS"
fi
if [ "$FSTACK" == "true" ]; then
EXPERIMENT_NAME="$EXPERIMENT_NAME.fstack"
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment