From 04f3e5a9edea83376b188ddff80fe04bd04efddb Mon Sep 17 00:00:00 2001
From: Christoph Niethammer <niethammer@hlrs.de>
Date: Fri, 23 Feb 2018 08:29:10 +0000
Subject: [PATCH] Sit class file and Cray XC40 patch for score-P 3.1

---
 packages/performance/scorep/scorep-3.1        | 63 +++++++++++++++++++
 .../performance/scorep/scorep-3.1-0001.patch  | 47 ++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100755 packages/performance/scorep/scorep-3.1
 create mode 100644 packages/performance/scorep/scorep-3.1-0001.patch

diff --git a/packages/performance/scorep/scorep-3.1 b/packages/performance/scorep/scorep-3.1
new file mode 100755
index 0000000..a7e5dbb
--- /dev/null
+++ b/packages/performance/scorep/scorep-3.1
@@ -0,0 +1,63 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2018
+#
+
+CATEGORY="performance"
+PACKAGE="scorep"
+VERSION="3.1"
+URL="http://www.vi-hps.org/projects/score-p"
+INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
+
+
+# Archive A and package name P
+A="${PACKAGE}-${VERSION}.tar.gz"
+P="${PACKAGE}-${VERSION}"
+
+
+# Other interesting configure options:
+#--enable-sampling \
+CONFIGURE_OPTS=" \
+        --enable-shared \
+        --enable-static \
+        "
+
+#CONFIGURE_OPTS+=" --with-nocross-compiler-suite=intel"
+
+case $PLATFORM in
+laki|slc)
+        enable_gui=0
+        ;;
+hazelhen)
+        CONFIGURE_OPTS+=" ac_scorep_platform=crayxc"
+        ;;
+*)
+        enable_gui=1
+        ;;
+esac
+
+if [[ $enable_gui = 1 ]] ; then
+	#QT_DIR=$(qtpaths --install-prefix)
+	#CONFIGURE_OPTS += " --with-qt=$QT_DIR "
+        CONFIGURE_OPTS+=" --with-gui"
+else
+	CONFIGURE_OPTS+=" --without-gui"
+fi
+
+
+PAPI_BASE=$(dirname $(dirname $(which papi_avail)))
+if  [ ! -z $PAPI_BASE ]
+then
+	CONFIGURE_OPTS+=" --with-papi-header=$PAPI_BASE/include --with-papi-lib=$PAPI_BASE/lib "
+fi
+
+src_prepare() {
+case $PLATFORM in
+hazelhen)
+        patch -p1 < $SCLASS_DIR/$sit_classfile-0001.patch
+        ;;
+*)
+        ;;
+esac
+}
diff --git a/packages/performance/scorep/scorep-3.1-0001.patch b/packages/performance/scorep/scorep-3.1-0001.patch
new file mode 100644
index 0000000..81be8ee
--- /dev/null
+++ b/packages/performance/scorep/scorep-3.1-0001.patch
@@ -0,0 +1,47 @@
+Index: /src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h
+===================================================================
+--- /src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h	(revision 8827)
++++ /src/adapters/compiler/gcc-plugin/scorep_plugin_tree-flow.h	(revision 12570)
+@@ -24,4 +24,9 @@
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
++
++#if SCOREP_GCC_PLUGIN_TARGET_VERSION >= 7000
++#include "tree-vrp.h"
++#endif
++
+ #include "tree-ssanames.h"
+ #include "internal-fn.h"
+Index: /src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c
+===================================================================
+--- /src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c	(revision 10166)
++++ /src/adapters/compiler/gcc-plugin/scorep_plugin_inst_descriptor.inc.c	(revision 12570)
+@@ -195,5 +195,5 @@
+ 
+     /* Align the struct generously, so that it works for 32 and 64 bit */
+-    DECL_ALIGN( region_descr_var )      = 64 * BITS_PER_UNIT;
++    SET_DECL_ALIGN( region_descr_var, 64 * BITS_PER_UNIT );
+     DECL_USER_ALIGN( region_descr_var ) = 1;
+ 
+Index: /src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h
+===================================================================
+--- /src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h	(revision 10118)
++++ /src/adapters/compiler/gcc-plugin/scorep_plugin_gcc_version_compatibility.h	(revision 12570)
+@@ -40,2 +40,6 @@
+ #define GIMPLE gimple *
+ #endif
++
++#if SCOREP_GCC_PLUGIN_TARGET_VERSION < 7000
++#define SET_DECL_ALIGN( decl, x ) DECL_ALIGN( decl ) = ( x )
++#endif
+Index: /OPEN_ISSUES
+===================================================================
+--- /OPEN_ISSUES	(revision 12484)
++++ /OPEN_ISSUES	(revision 12570)
+@@ -140,5 +140,5 @@
+   - Due to constant changes in the plug-in API of the GNU compiler
+     infrastructure, it is unlikely that the Score-P instrumentation
+-    plug-in builds with versions newer than GCC 6.
++    plug-in builds with versions newer than GCC 7.
+ 
+   - The pgCC compiler versions 13.9 and higher preinclude omp.h for