Merge pull request #122 from chriskirkland/feature/unixbench

ibmcb · web-flow · commit 8caa29cc74f3 · 2016-09-06T16:06:19.000-04:00
Added UnixBench as a workload for CBTool
diff --git a/configs/templates/PUBLIC_application_submitters.txt b/configs/templates/PUBLIC_application_submitters.txt
@@ -101,3 +101,11 @@ IAIT = uniformIXIXI60I180
 LOAD_LEVEL = uniformIXIXI1I3
 LOAD_DURATION = uniformIXIXI40I60
 LIFETIME = uniformIXIXI200I300
+
+[AIDRS_TEMPLATES : SIMPLEUB]
+TYPE = unixbench
+MAX_AIS = 8000
+IAIT = uniformIXIXI120I180
+LOAD_LEVEL = uniformIXIXI1I5
+LOAD_DURATION = uniformIXIXI40I60
+LIFETIME = uniformIXIXI500I600
diff --git a/scripts/unixbench/cb_unixbench.sh b/scripts/unixbench/cb_unixbench.sh
@@ -0,0 +1,201 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2012 IBM Corp.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+set -x
+
+source $(echo $0 | sed -e "s/\(.*\/\)*.*/\1.\//g")/cb_common.sh
+
+LOAD_PROFILE=$1
+LOAD_LEVEL=$2
+LOAD_DURATION=$3
+LOAD_ID=$4
+SLA_RUNTIME_TARGETS=$5
+
+if [[ -z "$LOAD_PROFILE" || -z "$LOAD_LEVEL" || -z "$LOAD_DURATION" || -z "$LOAD_ID" ]]
+then
+    syslog_netcat "Usage: cb_unixbench.sh <load profile> <load level> <load duration> <load_id>"
+    exit 1
+fi
+
+UNIXBENCH_DIR="~/byte-unixbench/UnixBench"
+eval UNIXBENCH_DIR=${UNIXBENCH_DIR}
+
+UNIXBENCH_IP=`get_ips_from_role unixbench`
+update_app_errors 0 reset
+
+syslog_netcat "Benchmarking UnixBench SUT: UNIXBENCH=${UNIXBENCH_IP} with (default) Index tests."
+
+OUTPUT_FILE=$(mktemp)
+if [[ $LOAD_PROFILE == "test" ]]
+then
+    execute_load_generator "cat ./test_output.txt" ${OUTPUT_FILE}
+else
+    cd ${UNIXBENCH_DIR}
+    execute_load_generator "./Run" ${OUTPUT_FILE}
+    cd -
+fi
+
+NUM_CORES=`grep -P -m1 "CPUs? in system" ${OUTPUT_FILE} | cut -d' ' -f1`
+
+# --------------------- START Aggregate metrics -------------------------------- #
+TMP=$(mktemp)
+grep -m 1 -A 14 "System Benchmarks .* INDEX" ${OUTPUT_FILE} > $TMP
+
+# Dhrystone 2 using register variables
+DHRY_RESULT=$(grep "Dhrystone 2 using register variables" $TMP | awk '{print $(NF-1)}')
+DHRY_INDEX=$(grep "Dhrystone 2 using register variables" $TMP | awk '{print $NF}')
+# Double-Precision Whetstone
+WHET_RESULT=$(grep "Double-Precision Whetstone" $TMP | awk '{print $(NF-1)}')
+WHET_INDEX=$(grep "Double-Precision Whetstone" $TMP | awk '{print $NF}')
+# Execl Throughput
+EXECL_RESULT=$(grep "Execl Throughput" $TMP | awk '{print $(NF-1)}')
+EXECL_INDEX=$(grep "Execl Throughput" $TMP | awk '{print $NF}')
+# File Copy 1024 bufsize 2000 maxblocks
+FC1024_RESULT=$(grep "File Copy 1024 bufsize 2000 maxblocks" $TMP | awk '{print $(NF-1)}')
+FC1024_INDEX=$(grep "File Copy 1024 bufsize 2000 maxblocks" $TMP | awk '{print $NF}')
+# File Copy 256 bufsize 500 maxblocks
+FC256_RESULT=$(grep "File Copy 256 bufsize 500 maxblocks" $TMP | awk '{print $(NF-1)}')
+FC256_INDEX=$(grep "File Copy 256 bufsize 500 maxblocks" $TMP | awk '{print $NF}')
+# File Copy 4096 bufsize 8000 maxblocks
+FC4096_RESULT=$(grep "File Copy 4096 bufsize 8000 maxblocks" $TMP | awk '{print $(NF-1)}')
+FC4096_INDEX=$(grep "File Copy 4096 bufsize 8000 maxblocks" $TMP | awk '{print $NF}')
+# Pipe Throughput
+PIPE_RESULT=$(grep "Pipe Throughput" $TMP | awk '{print $(NF-1)}')
+PIPE_INDEX=$(grep "Pipe Throughput" $TMP | awk '{print $NF}')
+# Pipe-based Context Switching
+CTXT_RESULT=$(grep "Pipe-based Context Switching" $TMP | awk '{print $(NF-1)}')
+CTXT_INDEX=$(grep "Pipe-based Context Switching" $TMP | awk '{print $NF}')
+# Process Creation
+PROC_RESULT=$(grep "Process Creation" $TMP | awk '{print $(NF-1)}')
+PROC_INDEX=$(grep "Process Creation" $TMP | awk '{print $NF}')
+# Shell Scripts (1 concurrent)
+SH1_RESULT=$(grep "Shell Scripts (1 concurrent)" $TMP | awk '{print $(NF-1)}')
+SH1_INDEX=$(grep "Shell Scripts (1 concurrent)" $TMP | awk '{print $NF}')
+# Shell Scripts (8 concurrent)
+SH8_RESULT=$(grep "Shell Scripts (8 concurrent)" $TMP | awk '{print $(NF-1)}')
+SH8_INDEX=$(grep "Shell Scripts (8 concurrent)" $TMP | awk '{print $NF}')
+# System Call Overhead
+SYSO_RESULT=$(grep "System Call Overhead" $TMP | awk '{print $(NF-1)}')
+SYSO_INDEX=$(grep "System Call Overhead" $TMP | awk '{print $NF}')
+# System Benchmarks Index Score
+TOTAL_INDEX=$(grep "System Benchmarks Index Score" $TMP | awk '{print $NF}')
+
+# multi-core results (when available)
+NUM_RESULTS=`grep -c "System Benchmarks .* INDEX" ${OUTPUT_FILE}`
+if [ "$NUM_RESULTS" -gt 1 ]
+then
+   TMP=$(mktemp)
+   grep -m 2 -A 14 "System Benchmarks .* INDEX" ${OUTPUT_FILE} | tail -n 15 > $TMP
+
+   # Dhrystone 2 using register variables
+   MC_DHRY_RESULT=$(grep "Dhrystone 2 using register variables" $TMP | awk '{print $(NF-1)}')
+   MC_DHRY_INDEX=$(grep "Dhrystone 2 using register variables" $TMP | awk '{print $NF}')
+   # Double-Precision Whetstone
+   MC_WHET_RESULT=$(grep "Double-Precision Whetstone" $TMP | awk '{print $(NF-1)}')
+   MC_WHET_INDEX=$(grep "Double-Precision Whetstone" $TMP | awk '{print $NF}')
+   # Execl Throughput
+   MC_EXECL_RESULT=$(grep "Execl Throughput" $TMP | awk '{print $(NF-1)}')
+   MC_EXECL_INDEX=$(grep "Execl Throughput" $TMP | awk '{print $NF}')
+   # File Copy 1024 bufsize 2000 maxblocks
+   MC_FC1024_RESULT=$(grep "File Copy 1024 bufsize 2000 maxblocks" $TMP | awk '{print $(NF-1)}')
+   MC_FC1024_INDEX=$(grep "File Copy 1024 bufsize 2000 maxblocks" $TMP | awk '{print $NF}')
+   # File Copy 256 bufsize 500 maxblocks
+   MC_FC256_RESULT=$(grep "File Copy 256 bufsize 500 maxblocks" $TMP | awk '{print $(NF-1)}')
+   MC_FC256_INDEX=$(grep "File Copy 256 bufsize 500 maxblocks" $TMP | awk '{print $NF}')
+   # File Copy 4096 bufsize 8000 maxblocks
+   MC_FC4096_RESULT=$(grep "File Copy 4096 bufsize 8000 maxblocks" $TMP | awk '{print $(NF-1)}')
+   MC_FC4096_INDEX=$(grep "File Copy 4096 bufsize 8000 maxblocks" $TMP | awk '{print $NF}')
+   # Pipe Throughput
+   MC_PIPE_RESULT=$(grep "Pipe Throughput" $TMP | awk '{print $(NF-1)}')
+   MC_PIPE_INDEX=$(grep "Pipe Throughput" $TMP | awk '{print $NF}')
+   # Pipe-based Context Switching
+   MC_CTXT_RESULT=$(grep "Pipe-based Context Switching" $TMP | awk '{print $(NF-1)}')
+   MC_CTXT_INDEX=$(grep "Pipe-based Context Switching" $TMP | awk '{print $NF}')
+   # Process Creation
+   MC_PROC_RESULT=$(grep "Process Creation" $TMP | awk '{print $(NF-1)}')
+   MC_PROC_INDEX=$(grep "Process Creation" $TMP | awk '{print $NF}')
+   # Shell Scripts (1 concurrent)
+   MC_SH1_RESULT=$(grep "Shell Scripts (1 concurrent)" $TMP | awk '{print $(NF-1)}')
+   MC_SH1_INDEX=$(grep "Shell Scripts (1 concurrent)" $TMP | awk '{print $NF}')
+   # Shell Scripts (8 concurrent)
+   MC_SH8_RESULT=$(grep "Shell Scripts (8 concurrent)" $TMP | awk '{print $(NF-1)}')
+   MC_SH8_INDEX=$(grep "Shell Scripts (8 concurrent)" $TMP | awk '{print $NF}')
+   # System Call Overhead
+   MC_SYSO_RESULT=$(grep "System Call Overhead" $TMP | awk '{print $(NF-1)}')
+   MC_SYSO_INDEX=$(grep "System Call Overhead" $TMP | awk '{print $NF}')
+   # System Benchmarks Index Score
+   MC_TOTAL_INDEX=$(grep "System Benchmarks Index Score" $TMP | awk '{print $NF}')
+fi
+# ---------------------- END Aggregate metrics --------------------------------- #
+
+# --------------------- START Reporting metrics -------------------------------- #
+~/cb_report_app_metrics.py load_id:${LOAD_ID}:seqnum \
+load_level:${LOAD_LEVEL}:load \
+load_profile:${LOAD_PROFILE}:name \
+load_duration:${LOAD_DURATION}:sec \
+num_cores:${NUM_CORES}:num \
+dhry_result:${DHRY_RESULT}:lps \
+dhry_index:${DHRY_INDEX}:num \
+whet_result:${WHET_RESULT}:MWIPS \
+whet_index:${WHET_INDEX}:num \
+execl_result:${EXECL_RESULT}:lps \
+execl_index:${EXECL_INDEX}:num \
+fc1024_result:${FC1024_RESULT}:KBPs \
+fc1024_index:${FC1024_INDEX}:num \
+fc256_result:${FC256_RESULT}:KBPs \
+fc256_index:${FC256_INDEX}:num \
+fc4096_result:${FC4096_RESULT}:KBPs \
+fc4096_index:${FC4096_INDEX}:num \
+pipe_result:${PIPE_RESULT}:lps \
+pipe_index:${PIPE_INDEX}:num \
+ctxt_result:${CTXT_RESULT}:lps \
+ctxt_index:${CTXT_INDEX}:num \
+proc_result:${PROC_RESULT}:lps \
+proc_index:${PROC_INDEX}:num \
+sh1_result:${SH1_RESULT}:lpm \
+sh1_index:${SH1_INDEX}:num \
+sh8_result:${SH8_RESULT}:lpm \
+sh8_index:${SH8_INDEX}:num \
+syso_result:${SYSO_RESULT}:lps \
+syso_index:${SYSO_INDEX}:num \
+total_index:${TOTAL_INDEX}:num \
+mc_dhry_result:${MC_DHRY_RESULT}:lps \
+mc_dhry_index:${MC_DHRY_INDEX}:num \
+mc_whet_result:${MC_WHET_RESULT}:MWIPS \
+mc_whet_index:${MC_WHET_INDEX}:num \
+mc_execl_result:${MC_EXECL_RESULT}:lps \
+mc_execl_index:${MC_EXECL_INDEX}:num \
+mc_fc1024_result:${MC_FC1024_RESULT}:KBPs \
+mc_fc1024_index:${MC_FC1024_INDEX}:num \
+mc_fc256_result:${MC_FC256_RESULT}:KBPs \
+mc_fc256_index:${MC_FC256_INDEX}:num \
+mc_fc4096_result:${MC_FC4096_RESULT}:KBPs \
+mc_fc4096_index:${MC_FC4096_INDEX}:num \
+mc_pipe_result:${MC_PIPE_RESULT}:lps \
+mc_pipe_index:${MC_PIPE_INDEX}:num \
+mc_ctxt_result:${MC_CTXT_RESULT}:lps \
+mc_ctxt_index:${MC_CTXT_INDEX}:num \
+mc_proc_result:${MC_PROC_RESULT}:lps \
+mc_proc_index:${MC_PROC_INDEX}:num \
+mc_sh1_result:${MC_SH1_RESULT}:lpm \
+mc_sh1_index:${MC_SH1_INDEX}:num \
+mc_sh8_result:${MC_SH8_RESULT}:lpm \
+mc_sh8_index:${MC_SH8_INDEX}:num \
+mc_syso_result:${MC_SYSO_RESULT}:lps \
+mc_syso_index:${MC_SYSO_INDEX}:num \
+mc_total_index:${MC_TOTAL_INDEX}:num \
+errors:$(update_app_errors):num \
+completion_time:$(update_app_completiontime):sec \
+quiescent_time:$(update_app_quiescent):sec\
+${SLA_RUNTIME_TARGETS}
+# --------------------- END Reporting metrics -------------------------------- #
+
+rm ${OUTPUT_FILE}
+
+exit 0
diff --git a/scripts/unixbench/dependencies.txt b/scripts/unixbench/dependencies.txt
@@ -0,0 +1,51 @@
+### START - Dependency installation order ###
+git-order = 50
+gcc-order = 51
+perl-order = 52
+unixbench-order = 53
+### END - Dependency installation order ###
+
+### START - Dependency-specific installation method ###
+# pm = "package manager" (yum or apt-get)
+# sl = "soft link" (assume that the dependency is already installed, just has to
+# be properly exposed to the user's path.
+# git = git clone using above giturl
+# pip = python pip utility
+# man = "manual"
+gcc-install = pm
+git-install = pm
+perl-install = pm
+unixbench-install = git
+### END - Dependency-specific installation method ###
+
+### START - Tests ###
+git-configure = gcc -v
+git-configure = git --version
+perl-configure = perl -v; perl -e 'require Time::HiRes'
+unixbench-configure = ls -la ~/byte-unixbench/UnixBench/Run
+### END - Tests ###
+
+### START - Dependency versions ###
+gcc-ver = ANY
+git-ver = ANY
+perl-ver = 5.10
+unixbench-ver = ANY
+### END - Dependency versions ###
+
+### START - Dependency URLs ###
+common-unixbench-urls-man = https://github.com/kdlucas/byte-unixbench.git
+### END - Dependency URLs ###
+
+### START -  Dependency and method-specific command lines ###
+ubuntu-gcc-preinstall-pm = apt-get update -y
+ubuntu-gcc-install-pm = package_install build-essential
+fedora-gcc-install-pm = package_install gcc
+
+common-git-install-pm = package_install git-all
+
+# perl package only need to be explicitly installed on CentOS 6.x
+fedora-perl-install-pm = package_install perl-Time-HiRes
+
+common-unixbench-preinstall-git = cd ~
+common-unixbench-install-git = git clone URL
+### END -  Dependency and method-specific command lines ###
diff --git a/scripts/unixbench/virtual_application.txt b/scripts/unixbench/virtual_application.txt
@@ -0,0 +1,29 @@
+# Parameters for this Virtual Application (Application Instance - AI) type should
+# be set on YOUR private configuration configuration file, including the ones 
+# commented.
+
+[AI_TEMPLATES : UNIXBENCH] 
+
+# Attributes MANDATORY for all Virtual Applications
+SUT = unixbench
+LOAD_BALANCER_SUPPORTED = $False
+RESIZE_SUPPORTED = $False
+REGENERATE_DATA = $False 
+LOAD_GENERATOR_ROLE = unixbench
+LOAD_MANAGER_ROLE = unixbench
+METRIC_AGGREGATOR_ROLE = unixbench
+CAPTURE_ROLE = unixbench
+# unused
+LOAD_PROFILE = default
+LOAD_LEVEL = uniformIXIXI1I5
+LOAD_DURATION = 60
+REPORTED_METRICS = num_cores, dhry_result, dhry_index, whet_result, whet_index, execl_result, execl_index, fc1024_result, fc1024_index, fc256_result, fc256_index, fc4096_result, fc4096_index, pipe_result, pipe_index, ctxt_result, ctxt_index, proc_result, proc_index, sh1_result, sh1_index, sh8_result, sh8_index, syso_result, syso_index, total_index, mc_dhry_result, mc_dhry_index, mc_whet_result, mc_whet_index, mc_execl_result, mc_execl_index, mc_fc1024_result, mc_fc1024_index, mc_fc256_result, mc_fc256_index, mc_fc4096_result, mc_fc4096_index, mc_pipe_result, mc_pipe_index, mc_ctxt_result, mc_ctxt_index, mc_proc_result, mc_proc_index, mc_sh1_result, mc_sh1_index, mc_sh8_result, mc_sh8_index, mc_syso_result, mc_syso_index, mc_total_index, errors, completion_time, quiescent_time
+
+
+# VApp-specific MANDATORY attributes
+DESCRIPTION = Deploys an SINGLE VM and runs the Index set of tests in UnixBench.\n
+START = cb_unixbench.sh
+
+# VApp-specific modifier parameters. Commented attributes imply default values assumed
+
+# Inter-Virtual Application instances (inter-AI) synchronized execution. Entirely optional
