summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2012-07-27 08:48:33 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:48:53 -0700
commitf73d71935122aaef2e32e8c34f1004864d05c934 (patch)
treeaaeba1ba80fb63cafe01a2930310571ef1c337ee
parentf9eaa6b1c53586f277a51f29089ff96732c9a899 (diff)
also print out build number (perforce change list)
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13556]
-rw-r--r--Makefile2
-rw-r--r--setup_environment3
-rw-r--r--version_detection.mk3
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7f0897a..23a34b0 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ check_setup_environment:
echo ""; \
exit 102; \
else \
- echo; echo -n " Building GPGPU-Sim version "; cat version | awk '/Version/ {print $$8}'; echo " on CUDA version $(CUDA_VERSION_STRING)"; echo; \
+ echo; echo " Building GPGPU-Sim version $(GPGPUSIM_VERSION) (build $(GPGPUSIM_BUILD)) with CUDA version $(CUDA_VERSION_STRING)"; echo; \
true; \
fi \
fi
diff --git a/setup_environment b/setup_environment
index 094e427..f20118e 100644
--- a/setup_environment
+++ b/setup_environment
@@ -4,7 +4,8 @@ export GPGPUSIM_SETUP_ENVIRONMENT_WAS_RUN=
export GPGPUSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
GPGPUSIM_VERSION_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Version/ {print $8}'`
-echo "GPGPU-Sim version $GPGPUSIM_VERSION_STRING";
+GPGPUSIM_BUILD_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Change/ {print $6}'`
+echo "GPGPU-Sim version $GPGPUSIM_VERSION_STRING (build $GPGPUSIM_BUILD_STRING)";
if [ ! -n "$CUDA_INSTALL_PATH" ]; then
echo "ERROR ** Install CUDA Toolkit and set CUDA_INSTALL_PATH.";
diff --git a/version_detection.mk b/version_detection.mk
index 3824866..eac96e0 100644
--- a/version_detection.mk
+++ b/version_detection.mk
@@ -26,6 +26,9 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Detect GPGPU-Sim Version
+GPGPUSIM_VERSION=$(shell cat $(GPGPUSIM_ROOT)/version | awk '/Version/ {print $$8}' )
+GPGPUSIM_BUILD=$(shell cat $(GPGPUSIM_ROOT)/version | awk '/Change/ {print $$6}' )
# Detect CUDA Runtime Version
CUDA_VERSION_STRING:=$(shell $(CUDA_INSTALL_PATH)/bin/nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//')