Skip to content

Commit aa7f4e6

Browse files
chesik-amdchesik-amd
committed
Replace GDT_ with AMDT_
1 parent c81efbb commit aa7f4e6

23 files changed

+97
-97
lines changed

‎GPUPerfAPI/Build/Linux/Common.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ADDL_CFLAGS =
1212
CFLAGS = -std=c++11 $(OPTIMIZE) -fPIC -D_LINUX -Wno-write-strings $(PLATFORM_CFLAG) $(ADDL_CFLAGS)
1313
# ADDLCFLAGS = -Wall -Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Werror -msse
1414
PLATFORM_DIR = x64
15-
BUILD_DEF = -DGDT_BUILD_SUFFIX=
15+
BUILD_DEF = -DAMDT_BUILD_SUFFIX=
1616
HSA_PLATFORM_DIR = x86_64
1717
HSA_PLATFORM_SUFFIX = 64
1818
GLES_PLATFORM_DIR=Linx64
@@ -25,9 +25,9 @@ OBJ_DIR = $(BASE_OBJDIR)/$(DEBUG_RELEASE)$(INTERNAL_PUBLIC)/$(PLATFORM_DIR)
2525
# Build defines
2626
BASE_DEFINES = -D_LINUX -DUSE_POINTER_SINGLETON
2727
ADDL_DEFINES =
28-
BUILD_DEFINES = -DGDT_PUBLIC -DGDT_BUILD_SUFFIX=\"\"
29-
PLATFORM_DEFINES = -DGDT_PLATFORM_SUFFIX=\"\"
30-
DEBUG_DEFINES = -DGDT_DEBUG_SUFFIX=\"\"
28+
BUILD_DEFINES = -DAMDT_PUBLIC -DAMDT_BUILD_SUFFIX=\"\"
29+
PLATFORM_DEFINES = -DAMDT_PLATFORM_SUFFIX=\"\"
30+
DEBUG_DEFINES = -DAMDT_DEBUG_SUFFIX=\"\"
3131
DEFINES = $(BASE_DEFINES) $(BUILD_DEFINES) $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(ADDL_DEFINES)
3232

3333
GPACG_DIR = $(DEPTH)/GPUPerfAPICounterGenerator
@@ -60,9 +60,9 @@ COMMON_LIBS = -lGPUPerfAPI-Common$(TARGET_SUFFIX) -lGPUPerfAPICounterGenerator$(
6060
STANDARD_LIBS = -ldl -lpthread
6161

6262
# Build target overrides
63-
X86_OVERRIDES = "PLATFORM_CFLAG = -m32 -msse2" "PLATFORM_LFLAG = -m32" "PLATFORM_DEFINES = -DX86 -DGDT_PLATFORM_SUFFIX=\\\"32\\\"" "CODEXL_OUTPUT_DIR = Output_x86" "PLATFORM_DIR = x86" "HSA_PLATFORM_DIR = x86" "HSA_PLATFORM_SUFFIX =" "HSA_PLATFORM_SUFFIX_COMPILER_LIB = 32" "GLES_PLATFORM_DIR = Linx86"
64-
INTERNAL_OVERRIDES = "BUILD_DEFINES = -DGDT_INTERNAL -DGDT_BUILD_SUFFIX=\\\"-Internal\\\"" "INTERNAL_PUBLIC = _Internal"
65-
DEBUG_OVERRIDES = "OPTIMIZE = $(DEBUG_CFLAGS)" "DEBUG_RELEASE = debug" "DEBUG_DEFINES = -DGDT_DEBUG_SUFFIX=\\\"-d\\\""
63+
X86_OVERRIDES = "PLATFORM_CFLAG = -m32 -msse2" "PLATFORM_LFLAG = -m32" "PLATFORM_DEFINES = -DX86 -DAMDT_PLATFORM_SUFFIX=\\\"32\\\"" "CODEXL_OUTPUT_DIR = Output_x86" "PLATFORM_DIR = x86" "HSA_PLATFORM_DIR = x86" "HSA_PLATFORM_SUFFIX =" "HSA_PLATFORM_SUFFIX_COMPILER_LIB = 32" "GLES_PLATFORM_DIR = Linx86"
64+
INTERNAL_OVERRIDES = "BUILD_DEFINES = -DAMDT_INTERNAL -DAMDT_BUILD_SUFFIX=\\\"-Internal\\\"" "INTERNAL_PUBLIC = _Internal"
65+
DEBUG_OVERRIDES = "OPTIMIZE = $(DEBUG_CFLAGS)" "DEBUG_RELEASE = debug" "DEBUG_DEFINES = -DAMDT_DEBUG_SUFFIX=\\\"-d\\\""
6666

6767
BUILD_X86_OVERRIDES = "TARGET_SUFFIX = 32" "AMD_LIB_PATH = Bin/Linx86/" "AMD_LIB_SUFFIX = 32" $(X86_OVERRIDES)
6868
BUILD_INTERNAL_OVERRIDES = "TARGET_SUFFIX = -Internal" "AMD_LIB_PATH = Bin-Internal/Linx64/" "AMD_LIB_SUFFIX = -Internal" $(INTERNAL_OVERRIDES)

‎GPUPerfAPI/Build/VS2015/GPA-Common.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
2020
</PropertyGroup>
2121
<PropertyGroup Label="UserMacros">
22-
<GDTCRT>MT</GDTCRT>
22+
<AMDTCRT>MT</AMDTCRT>
2323
</PropertyGroup>
2424
<PropertyGroup>
2525
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -32,15 +32,15 @@
3232
<RuntimeLibrary Condition="$([System.Convert]::ToBoolean($(IsRelease)))">MultiThreaded</RuntimeLibrary>
3333
</ClCompile>
3434
<Link>
35-
<OutputFile>$(OutDir)$(GDTProjectName).exe</OutputFile>
35+
<OutputFile>$(OutDir)$(AMDTProjectName).exe</OutputFile>
3636
</Link>
3737
</ItemDefinitionGroup>
3838
<ItemGroup>
3939
<BuildMacro Include="MyBinDir">
4040
<Value>$(MyBinDir)</Value>
4141
</BuildMacro>
42-
<BuildMacro Include="GDTCRT">
43-
<Value>$(GDTCRT)</Value>
42+
<BuildMacro Include="AMDTCRT">
43+
<Value>$(AMDTCRT)</Value>
4444
</BuildMacro>
4545
</ItemGroup>
4646
</Project>

‎GPUPerfAPI/Build/VS2015/GPA-DLL.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemDefinitionGroup>
77
<Link>
8-
<OutputFile>$(OutDir)$(GDTProjectName).dll</OutputFile>
8+
<OutputFile>$(OutDir)$(AMDTProjectName).dll</OutputFile>
99
</Link>
1010
</ItemDefinitionGroup>
1111
</Project>

‎GPUPerfAPI/GPUPerfAPI-Common/GPAFunctions.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
GPA_FUNCTION_PREFIX(GPA_RegisterLoggingCallback)
1414

15-
#ifdef GDT_INTERNAL
15+
#ifdef AMDT_INTERNAL
1616
GPA_FUNCTION_PREFIX(GPA_RegisterLoggingDebugCallback)
17-
#endif // GDT_INTERNAL
17+
#endif // AMDT_INTERNAL
1818

1919
GPA_FUNCTION_PREFIX(GPA_Initialize)
2020
GPA_FUNCTION_PREFIX(GPA_Destroy)
@@ -71,7 +71,7 @@ GPA_FUNCTION_PREFIX(GPA_GetSampleFloat32)
7171
GPA_FUNCTION_PREFIX(GPA_GetDeviceID)
7272
GPA_FUNCTION_PREFIX(GPA_GetDeviceDesc)
7373

74-
#ifdef GDT_INTERNAL
74+
#ifdef AMDT_INTERNAL
7575
GPA_FUNCTION_PREFIX(GPA_InternalSetDrawCallCounts)
7676
#endif
7777

‎GPUPerfAPI/GPUPerfAPI-Common/GPAHWInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ bool GPA_HWInfo::UpdateDeviceInfoBasedOnDeviceID()
147147
}
148148
}
149149

150-
#if defined(WIN32) && defined(GDT_INTERNAL)
150+
#if defined(WIN32) && defined(AMDT_INTERNAL)
151151

152152
//only emit an error for AMD devices
153153
if (IsAMD())

‎GPUPerfAPI/GPUPerfAPI-Common/GPUPerfAPI-Private.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// For internal use only
1616

1717
// *INDENT-OFF*
18-
#ifdef GDT_INTERNAL
18+
#ifdef AMDT_INTERNAL
1919
/// \brief Register a debug callback function to receive debug log messages.
2020
///
2121
/// Only one debug callback function can be registered, so the implementation should be able
@@ -32,7 +32,7 @@ GPALIB_DECL GPA_Status GPA_RegisterLoggingDebugCallback(GPA_Log_Debug_Type loggi
3232
/// \return The GPA result status of the operation. GPA_STATUS_OK is returned if the operation is successful.
3333
GPALIB_DECL GPA_Status GPA_InternalSetDrawCallCounts(const int iCounts);
3434

35-
#endif // GDT_INTERNAL
35+
#endif // AMDT_INTERNAL
3636
// *INDENT-ON*
3737

3838
/// \brief Internal function. Unsupported and may be removed from the API at any time.

‎GPUPerfAPI/GPUPerfAPI-Common/GPUPerfAPI.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ GPALIB_DECL GPA_Status GPA_RegisterLoggingCallback(GPA_Logging_Type loggingType,
216216
}
217217

218218
//-----------------------------------------------------------------------------
219-
#ifdef GDT_INTERNAL
219+
#ifdef AMDT_INTERNAL
220220
GPALIB_DECL GPA_Status GPA_RegisterLoggingDebugCallback(GPA_Log_Debug_Type loggingType, GPA_LoggingDebugCallbackPtrType pCallbackFuncPtr)
221221
{
222222
if (nullptr == pCallbackFuncPtr &&
@@ -231,7 +231,7 @@ GPALIB_DECL GPA_Status GPA_RegisterLoggingDebugCallback(GPA_Log_Debug_Type loggi
231231
GPA_Log(GPA_LOG_DEBUG_MESSAGE, "Debug logging callback registered successfully.");
232232
return GPA_STATUS_OK;
233233
}
234-
#endif // GDT_INTERNAL
234+
#endif // AMDT_INTERNAL
235235

236236
//-----------------------------------------------------------------------------
237237
GPALIB_DECL GPA_Status GPA_Initialize()
@@ -1581,7 +1581,7 @@ static GPA_Status GPA_GetSample(gpa_uint32 sessionID, gpa_uint32 sampleID, gpa_u
15811581

15821582
status = checkSession->GetResult(resultLocationIter->second.m_pass, sampleID, resultLocationIter->second.m_offset, pResultBuffer);
15831583

1584-
#ifdef GDT_INTERNAL
1584+
#ifdef AMDT_INTERNAL
15851585
const char* pInternalName = g_pCurrentContext->m_pCounterAccessor->GetCounterName(numPublicCounters + *requiredCounterIter);
15861586
const char* pPublicName = g_pCurrentContext->m_pCounterAccessor->GetCounterName(counterIndex);
15871587

@@ -2011,7 +2011,7 @@ GPALIB_DECL GPA_Status GPA_GetDeviceDesc(const char** ppDesc)
20112011
return GPA_STATUS_ERROR_NOT_FOUND;
20122012
}
20132013

2014-
#ifdef GDT_INTERNAL
2014+
#ifdef AMDT_INTERNAL
20152015
//This function must be called before GPA_BeginSession()
20162016
GPALIB_DECL GPA_Status GPA_InternalSetDrawCallCounts(const int iCounts)
20172017
{

‎GPUPerfAPI/GPUPerfAPI-Common/GPUPerfAPITypes-Private.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ enum GPA_Log_Debug_Type
3636
GPA_LOG_ERROR_MESSAGE_AND_TRACE = 7,
3737
GPA_LOG_ALL = 0xFF,
3838

39-
#ifdef GDT_INTERNAL
39+
#ifdef AMDT_INTERNAL
4040
// these are private types that are only defined in internal builds
4141
GPA_LOG_DEBUG_ERROR = 0x0100,
4242
GPA_LOG_DEBUG_MESSAGE = 0x0200,
4343
GPA_LOG_DEBUG_TRACE = 0x0400,
4444
GPA_LOG_DEBUG_COUNTERDEFS = 0x0800,
4545
GPA_LOG_DEBUG_ALL = 0xFF00
46-
#endif // GDT_INTERNAL
46+
#endif // AMDT_INTERNAL
4747
};
4848

4949
/// this enum needs to be kept up to date with GDT_HW_GENERATION in DeviceInfo.h

‎GPUPerfAPI/GPUPerfAPI-Common/Logging.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ GPATracer::GPATracer()
2020
{
2121
m_logTab = 0;
2222

23-
#ifdef GDT_INTERNAL
23+
#ifdef AMDT_INTERNAL
2424
// in internal builds, we want all the tracing to be displayed
2525
m_topLevelOnly = false;
2626
#else
2727
// in public builds, the end-user should only see the functions they call
2828
m_topLevelOnly = true;
29-
#endif // GDT_INTERNAL
29+
#endif // AMDT_INTERNAL
3030
}
3131

3232

@@ -44,7 +44,7 @@ void GPATracer::EnterFunction(const char* pFunctionName)
4444
message += "Entering: ";
4545
message += pFunctionName;
4646

47-
#ifdef GDT_INTERNAL
47+
#ifdef AMDT_INTERNAL
4848
GPA_LogDebugTrace(message.c_str());
4949

5050
if (m_logTab == 0)
@@ -55,7 +55,7 @@ void GPATracer::EnterFunction(const char* pFunctionName)
5555

5656
#else
5757
GPA_LogTrace(message.c_str());
58-
#endif // GDT_INTERNAL
58+
#endif // AMDT_INTERNAL
5959
}
6060

6161
m_logTab++;
@@ -78,7 +78,7 @@ void GPATracer::LeaveFunction(const char* pFunctionName)
7878
message += "Leaving: ";
7979
message += pFunctionName;
8080

81-
#ifdef GDT_INTERNAL
81+
#ifdef AMDT_INTERNAL
8282
GPA_LogDebugTrace(message.c_str());
8383

8484
if (m_logTab == 0)
@@ -89,7 +89,7 @@ void GPATracer::LeaveFunction(const char* pFunctionName)
8989

9090
#else
9191
GPA_LogTrace(message.c_str());
92-
#endif // GDT_INTERNAL
92+
#endif // AMDT_INTERNAL
9393
}
9494
}
9595

@@ -141,7 +141,7 @@ void GPALogger::SetLoggingCallback(GPA_Logging_Type loggingType, GPA_LoggingCall
141141
}
142142
}
143143

144-
#ifdef GDT_INTERNAL
144+
#ifdef AMDT_INTERNAL
145145
void GPALogger::SetLoggingDebugCallback(GPA_Log_Debug_Type loggingType, GPA_LoggingDebugCallbackPtrType loggingDebugCallback)
146146
{
147147
if (nullptr == loggingDebugCallback)
@@ -155,13 +155,13 @@ void GPALogger::SetLoggingDebugCallback(GPA_Log_Debug_Type loggingType, GPA_Logg
155155
m_loggingDebugType = loggingType;
156156
}
157157
}
158-
#endif // GDT_INTERNAL
158+
#endif // AMDT_INTERNAL
159159

160160
void GPALogger::Log(GPA_Log_Debug_Type logType, const char* pMessage)
161161
{
162162
EnterCriticalSection(&m_hLock);
163163

164-
#ifdef GDT_INTERNAL
164+
#ifdef AMDT_INTERNAL
165165

166166
if (logType > GPA_LOG_ALL)
167167
{
@@ -175,7 +175,7 @@ void GPALogger::Log(GPA_Log_Debug_Type logType, const char* pMessage)
175175

176176
}
177177
else
178-
#endif // GDT_INTERNAL
178+
#endif // AMDT_INTERNAL
179179
{
180180
// convert from private GPA_Log_Debug_type to public GPA_Logging_Type
181181
GPA_Logging_Type messageType = (GPA_Logging_Type)logType;

‎GPUPerfAPI/GPUPerfAPI-Common/Logging.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ using std::string;
3333
#undef TRACE_FUNCTION
3434
/// macro for tracing function calls
3535
#define TRACE_FUNCTION(func) ScopeTrace _tempScopeTraceObject(#func)
36-
#ifdef GDT_INTERNAL
36+
#ifdef AMDT_INTERNAL
3737
#undef TRACE_PRIVATE_FUNCTION
3838
#define TRACE_PRIVATE_FUNCTION(func) ScopeTrace _tempScopeTraceObject(#func)
3939
#else // public build
4040
#undef TRACE_PRIVATE_FUNCTION
4141
/// macro for tracing private function calls
4242
#define TRACE_PRIVATE_FUNCTION(func)
43-
#endif // GDT_INTERNAL / public build
43+
#endif // AMDT_INTERNAL / public build
4444
#else // disable trace functions
4545
#undef TRACE_FUNCTION
4646
#define TRACE_FUNCTION(func)
@@ -65,12 +65,12 @@ class GPALogger
6565
/// \param loggingCallback a pointer to the callback function
6666
void SetLoggingCallback(GPA_Logging_Type loggingType, GPA_LoggingCallbackPtrType loggingCallback);
6767

68-
#ifdef GDT_INTERNAL
68+
#ifdef AMDT_INTERNAL
6969
/// Sets the type of message the user would like to be informed of and a pointer to the callback function.
7070
/// \param loggingType the type of messages to pass on to the callback function
7171
/// \param loggingCallback a pointer to the callback function
7272
void SetLoggingDebugCallback(GPA_Log_Debug_Type loggingType, GPA_LoggingDebugCallbackPtrType loggingDebugCallback);
73-
#endif // GDT_INTERNAL
73+
#endif // AMDT_INTERNAL
7474

7575
/// Passes the supplied message to the callback function if the user has accepted that type of message.
7676
/// \param logType the type of message being supplied
@@ -102,7 +102,7 @@ class GPALogger
102102
/// \param pMsgFmt the message to format and pass along
103103
void LogDebugMessage(const char* pMsgFmt, ...)
104104
{
105-
#ifdef GDT_INTERNAL
105+
#ifdef AMDT_INTERNAL
106106

107107
// if the supplied message type is among those that the user wants be notified of,
108108
// then pass the message along.
@@ -128,14 +128,14 @@ class GPALogger
128128

129129
#else
130130
UNREFERENCED_PARAMETER(pMsgFmt);
131-
#endif // GDT_INTERNAL
131+
#endif // AMDT_INTERNAL
132132
}
133133

134134
/// Logs a formatted error message in debug builds; does nothing in release.
135135
/// \param pMsgFmt the message to format and pass along
136136
void LogDebugError(const char* pMsgFmt, ...)
137137
{
138-
#ifdef GDT_INTERNAL
138+
#ifdef AMDT_INTERNAL
139139

140140
// if the supplied message type is among those that the user wants be notified of,
141141
// then pass the message along.
@@ -161,15 +161,15 @@ class GPALogger
161161

162162
#else
163163
UNREFERENCED_PARAMETER(pMsgFmt);
164-
#endif // GDT_INTERNAL
164+
#endif // AMDT_INTERNAL
165165
}
166166

167167

168168
/// Logs a formatted error message in debug builds; does nothing in release.
169169
/// \param pMsgFmt the message to format and pass along
170170
void LogDebugTrace(const char* pMsgFmt, ...)
171171
{
172-
#ifdef GDT_INTERNAL
172+
#ifdef AMDT_INTERNAL
173173

174174
// if the supplied message type is among those that the user wants be notified of,
175175
// then pass the message along.
@@ -195,14 +195,14 @@ class GPALogger
195195

196196
#else
197197
UNREFERENCED_PARAMETER(pMsgFmt);
198-
#endif // GDT_INTERNAL
198+
#endif // AMDT_INTERNAL
199199
}
200200

201201
/// Logs a formatted message in internal builds; does nothing in public builds.
202202
/// \param pMsgFmt the message to format and pass along
203203
void LogDebugCounterDefs(const char* pMsgFmt, ...)
204204
{
205-
#ifdef GDT_INTERNAL
205+
#ifdef AMDT_INTERNAL
206206

207207
// if the supplied message type is among those that the user wants be notified of,
208208
// then pass the message along.
@@ -228,7 +228,7 @@ class GPALogger
228228

229229
#else
230230
UNREFERENCED_PARAMETER(pMsgFmt);
231-
#endif // GDT_INTERNAL
231+
#endif // AMDT_INTERNAL
232232
}
233233

234234
protected:
@@ -239,13 +239,13 @@ class GPALogger
239239
/// User-supplied callback function
240240
GPA_LoggingCallbackPtrType m_loggingCallback;
241241

242-
#ifdef GDT_INTERNAL
242+
#ifdef AMDT_INTERNAL
243243
/// User selected logging type that defines what debug messages they want to be notified of
244244
GPA_Log_Debug_Type m_loggingDebugType;
245245

246246
/// User-supplied debug callback function
247247
GPA_LoggingDebugCallbackPtrType m_loggingDebugCallback;
248-
#endif // GDT_INTERNAL
248+
#endif // AMDT_INTERNAL
249249

250250
#ifdef _WIN32
251251
CRITICAL_SECTION m_hLock; ///< lock for thread-safe access

0 commit comments

Comments
 (0)