Merge branch 'amd-master' of ssh://gerritgit/DevTools/ec/GPA into amd-master

Author: chesik-amd

.gitignore

@@ -25,6 +25,9 @@ bld/
 [Oo]bj/
 [Ll]og/
 Doc/public
+*.so
+*.a
+*.pyc
 
 # Visual Studo 2015 cache/options directory
 .vs/
@@ -240,4 +243,4 @@ FakesAssemblies/
 **/*.DesktopClient/ModelManifest.xml
 **/*.Server/GeneratedArtifacts
 **/*.Server/ModelManifest.xml
-_Pvt_Extensions
+_Pvt_Extensions

Build/Linux/Common.mk

@@ -30,16 +30,18 @@ PLATFORM_DEFINES = -DGDT_PLATFORM_SUFFIX=\"\"
 DEBUG_DEFINES = -DGDT_DEBUG_SUFFIX=\"\"
 DEFINES = $(BASE_DEFINES) $(BUILD_DEFINES) $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(ADDL_DEFINES)
 
-GPACG_DIR = $(DEPTH)/GPUPerfAPICounterGenerator
-GPACOMMON_DIR = $(DEPTH)/GPUPerfAPI-Common
-GPADEVICEINFO_DIR = $(DEPTH)/DeviceInfo
+GPASRC_DIR=$(DEPTH)/Src
+GPACG_DIR = $(GPASRC_DIR)/GPUPerfAPICounterGenerator
+GPACOMMON_DIR = $(GPASRC_DIR)/GPUPerfAPI-Common
+GPADEVICEINFO_DIR = $(GPASRC_DIR)/DeviceInfo
 
 COMMON_DIR = $(DEPTH)/../Common
 COMMON_SRC = $(COMMON_DIR)/Src
 ATI_STREAM_SDK_DIR = $(COMMON_DIR)/Lib/AMD/APPSDK/3-0
 HSA_DIR = /opt/rocm/hsa
 HSA_LIB_DIR = $(HSA_DIR)/lib/$(HSA_PLATFORM_DIR)
 DEVICEINFO_DIR = $(COMMON_SRC)/DeviceInfo
+DEVICEINFOINTERNAL_DIR = $(COMMON_SRC)/DeviceInfo-Internal
 GPUPERFAPIUTILS_DIR = $(COMMON_SRC)/GPUPerfAPIUtils
 ADL_DIR = $(COMMON_DIR)/Lib/AMD/ADL
 ADLUTIL_DIR = $(COMMON_DIR)/Src/ADLUtil

Build/Linux/CommonTargets.mk

@@ -40,7 +40,7 @@ all: default x86 Internal Internalx86 Dbg Dbgx86 DbgInternal DbgInternalx86
 
 BUILD_SRC=$(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
 
-$(OBJ_DIR)/%.o: ../Non-OpenSource/GPUPerfAPICounterGenerator/%.cpp
+$(OBJ_DIR)/%.o: ../../../GPA-Internal/Src/GPUPerfAPICounterGenerator/%.cpp
 	$(BUILD_SRC)
 
 $(OBJ_DIR)/%.o: %.cpp
@@ -64,6 +64,9 @@ $(OBJ_DIR)/%.o: $(AMDTMUTEX_DIR)/%.cpp
 $(OBJ_DIR)/%.o: $(DEVICEINFO_DIR)/%.cpp
 	$(BUILD_SRC)
 
+$(OBJ_DIR)/%.o: $(DEVICEINFOINTERNAL_DIR)/%.cpp
+	$(BUILD_SRC)
+
 $(OBJ_DIR)/%.o: $(GPUPERFAPIUTILS_DIR)/%.cpp
 	$(BUILD_SRC)
 

Build/Linux/build.sh

@@ -73,15 +73,15 @@ do
 done
 
 LOGFILE=$GPAROOT/Build/Linux/GPUPerfAPI_Build.log
-
-CL=$GPAROOT/GPUPerfAPICL
-HSA=$GPAROOT/GPUPerfAPIHSA
-GL=$GPAROOT/GPUPerfAPIGL
-GLES=$GPAROOT/GPUPerfAPIGLES
-COUNTERS=$GPAROOT/GPUPerfAPICounters
-COUNTERGENERATOR=$GPAROOT/GPUPerfAPICounterGenerator
-GPA_COMMON=$GPAROOT/GPUPerfAPI-Common
-GPA_DEVICEINFO=$GPAROOT/DeviceInfo
+GPASRC=$GPAROOT/Src
+CL=$GPASRC/GPUPerfAPICL
+HSA=$GPASRC/GPUPerfAPIHSA
+GL=$GPASRC/GPUPerfAPIGL
+GLES=$GPASRC/GPUPerfAPIGLES
+COUNTERS=$GPASRC/GPUPerfAPICounters
+COUNTERGENERATOR=$GPASRC/GPUPerfAPICounterGenerator
+GPA_COMMON=$GPASRC/GPUPerfAPI-Common
+GPA_DEVICEINFO=$GPASRC/DeviceInfo
 
 GLLIB=libGPUPerfAPIGL$DEBUG_SUFFIX.so
 GLESLIB=libGPUPerfAPIGLES$DEBUG_SUFFIX.so

Src/DeviceInfo/makefile

@@ -1,6 +1,6 @@
 #MAKE FILE FOR DeviceInfo
 
-DEPTH = ..
+DEPTH = ../..
 include $(DEPTH)/Build/Linux/Common.mk
 
 TARGETLIB = libDeviceInfo$(TARGET_SUFFIX).a
@@ -14,7 +14,7 @@ INCLUDES =	-I. \
 		-I$(DYNAMICLIBRARYMODULE_DIR)
 
 # for AMD-internal builds
-ifneq ("$(wildcard $(DEVICEINFO_DIR)/DeviceInfoInternal.cpp)","")
+ifneq ("$(wildcard $(DEVICEINFOINTERNAL_DIR)/DeviceInfoInternal.cpp)","")
     INTERNAL_OBJ := ./$(OBJ_DIR)/DeviceInfoInternal.o
 endif
 

Src/GPUPerfAPI-Common/makefile

@@ -1,6 +1,6 @@
 # Makefile for GPUPerfAPI-Common
 
-DEPTH = ..
+DEPTH = ../..
 include $(DEPTH)/Build/Linux/Common.mk
 
 TARGETLIB = libGPUPerfAPI-Common$(TARGET_SUFFIX).a

Src/GPUPerfAPICL/makefile

@@ -1,6 +1,6 @@
 # Makefile for GPUPerfAPICL
 
-DEPTH = ..
+DEPTH = ../..
 include $(DEPTH)/Build/Linux/Common.mk
 
 TARGETSO = libGPUPerfAPICL$(TARGET_SUFFIX).so

Src/GPUPerfAPICounterGenerator/makefile

@@ -1,6 +1,6 @@
 # Makefile for GPUPerfAPICounterGenerator
 
-DEPTH = ..
+DEPTH = ../..
 include $(DEPTH)/Build/Linux/Common.mk
 
 TARGETLIB = libGPUPerfAPICounterGenerator$(TARGET_SUFFIX).a

Src/GPUPerfAPICounters/makefile

@@ -1,6 +1,6 @@
 # Makefile for GPUPerfAPICounters
 
-DEPTH = ..
+DEPTH = ../..
 include $(DEPTH)/Build/Linux/Common.mk
 
 TARGETSO = libGPUPerfAPICounters$(TARGET_SUFFIX).so

Src/GPUPerfAPIGL/makefile

@@ -1,6 +1,6 @@
 # makefile for GPUPerfAPIGL
 
-DEPTH = ..
+DEPTH = ../..
 include $(DEPTH)/Build/Linux/Common.mk
 
 TARGETSO = libGPUPerfAPIGL$(TARGET_SUFFIX).so