Skip to content

Commit 6f56536

Browse files
drprajapdrprajap
committed
Coding style changes
Change-Id: I02149f509488243dc6a756a503603543c315acc0
1 parent 6210342 commit 6f56536

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+7012
-8505
lines changed

‎Source/GmmLib/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ set(HEADERS_
229229
${BS_DIR_GMMLIB}/inc/GmmLib.h
230230
)
231231

232-
set(UMD_HEADERS
232+
set(UMD_HEADERS
233233
${HEADERS_}
234234
${BS_DIR_GMMLIB}/inc/External/Common/GmmClientContext.h
235235
)
@@ -263,8 +263,6 @@ set(SOURCES_
263263
${BS_DIR_GMMLIB}/Utility/GmmLibObject.cpp
264264
${BS_DIR_GMMLIB}/Utility/GmmLog/GmmLog.cpp
265265
${BS_DIR_GMMLIB}/Utility/GmmUtility.cpp
266-
${BS_DIR_GMMLIB}/Utility/GmmHeap/GmmHeap.c
267-
${BS_DIR_GMMLIB}/Utility/GmmHeap/node.c
268266
)
269267

270268
set(UMD_SOURCES

‎Source/GmmLib/CachePolicy/GmmCachePolicy.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ OTHER DEALINGS IN THE SOFTWARE.
3232
/// @return GMM_PTE_CACHE_CONTROL_BITS:Populated PTE
3333
///
3434
/////////////////////////////////////////////////////////////////////////////////////
35-
GMM_PTE_CACHE_CONTROL_BITS GMM_STDCALL GmmCachePolicyGetPteType( GMM_RESOURCE_USAGE_TYPE Usage )
35+
GMM_PTE_CACHE_CONTROL_BITS GMM_STDCALL GmmCachePolicyGetPteType(GMM_RESOURCE_USAGE_TYPE Usage)
3636
{
3737
return pGmmGlobalContext->GetCachePolicyObj()->CachePolicyGetPteType(Usage);
3838
}
@@ -45,7 +45,7 @@ GMM_PTE_CACHE_CONTROL_BITS GMM_STDCALL GmmCachePolicyGetPteType( GMM_RESOURCE_US
4545
///
4646
/// @return 1 if the usage PTE entry is set for cached, 0 otherwise.
4747
/////////////////////////////////////////////////////////////////////////////////////
48-
uint8_t GMM_STDCALL GmmCachePolicyIsUsagePTECached( GMM_RESOURCE_USAGE_TYPE Usage )
48+
uint8_t GMM_STDCALL GmmCachePolicyIsUsagePTECached(GMM_RESOURCE_USAGE_TYPE Usage)
4949
{
5050
return pGmmGlobalContext->GetCachePolicyObj()->CachePolicyIsUsagePTECached(Usage);
5151
}
@@ -57,7 +57,7 @@ uint8_t GMM_STDCALL GmmCachePolicyIsUsagePTECached( GMM_RESOURCE_USAGE_TYPE Usag
5757
/// @param[in] pGmmResource: Pointer to the GmmResourceInfo class
5858
/// @return Cache policy usage
5959
/////////////////////////////////////////////////////////////////////////////////////
60-
GMM_RESOURCE_USAGE_TYPE GMM_STDCALL GmmCachePolicyGetResourceUsage( GMM_RESOURCE_INFO *pResInfo )
60+
GMM_RESOURCE_USAGE_TYPE GMM_STDCALL GmmCachePolicyGetResourceUsage(GMM_RESOURCE_INFO *pResInfo)
6161
{
6262
__GMM_ASSERT(pResInfo);
6363
return pResInfo->GetCachePolicyUsage();
@@ -85,7 +85,7 @@ void GMM_STDCALL GmmCachePolicyOverrideResourceUsage(GMM_RESOURCE_INFO *pResInfo
8585
/// @return MEMORY_OBJECT_CONTROL_STATE: Gen adjusted MOCS structure (cache
8686
/// policy) for the given buffer use.
8787
/////////////////////////////////////////////////////////////////////////////////////
88-
MEMORY_OBJECT_CONTROL_STATE GMM_STDCALL GmmCachePolicyGetMemoryObject( GMM_RESOURCE_INFO *pResInfo , GMM_RESOURCE_USAGE_TYPE Usage)
88+
MEMORY_OBJECT_CONTROL_STATE GMM_STDCALL GmmCachePolicyGetMemoryObject(GMM_RESOURCE_INFO *pResInfo, GMM_RESOURCE_USAGE_TYPE Usage)
8989
{
9090
return pGmmGlobalContext->GetCachePolicyObj()->CachePolicyGetMemoryObject(pResInfo, Usage);
9191
}
@@ -100,7 +100,7 @@ MEMORY_OBJECT_CONTROL_STATE GMM_STDCALL GmmCachePolicyGetMemoryObject( GMM_RESOU
100100
/// @return MEMORY_OBJECT_CONTROL_STATE: Populated memory object
101101
///
102102
/////////////////////////////////////////////////////////////////////////////////////
103-
MEMORY_OBJECT_CONTROL_STATE GMM_STDCALL GmmCachePolicyGetOriginalMemoryObject( GMM_RESOURCE_INFO *pResInfo)
103+
MEMORY_OBJECT_CONTROL_STATE GMM_STDCALL GmmCachePolicyGetOriginalMemoryObject(GMM_RESOURCE_INFO *pResInfo)
104104
{
105105
return pGmmGlobalContext->GetCachePolicyObj()->CachePolicyGetOriginalMemoryObject(pResInfo);
106106
}
@@ -126,8 +126,8 @@ GMM_GFX_MEMORY_TYPE GmmGetWantedMemoryType(GMM_CACHE_POLICY_ELEMENT CachePolicy)
126126
/////////////////////////////////////////////////////////////////////////////////////
127127
uint32_t GMM_STDCALL GmmCachePolicyGetMaxMocsIndex(void)
128128
{
129-
GMM_CACHE_POLICY *pCachePolicy = pGmmGlobalContext->GetCachePolicyObj();
130-
GmmLib::GmmGen9CachePolicy *ptr = static_cast<GmmLib::GmmGen9CachePolicy*>(pCachePolicy);
129+
GMM_CACHE_POLICY * pCachePolicy = pGmmGlobalContext->GetCachePolicyObj();
130+
GmmLib::GmmGen9CachePolicy *ptr = static_cast<GmmLib::GmmGen9CachePolicy *>(pCachePolicy);
131131
return ptr->CurrentMaxMocsIndex;
132132
}
133133

@@ -139,8 +139,8 @@ uint32_t GMM_STDCALL GmmCachePolicyGetMaxMocsIndex(void)
139139
/////////////////////////////////////////////////////////////////////////////////////
140140
uint32_t GMM_STDCALL GmmCachePolicyGetMaxL1HdcMocsIndex(void)
141141
{
142-
GMM_CACHE_POLICY *pCachePolicy = pGmmGlobalContext->GetCachePolicyObj();
143-
GmmLib::GmmGen9CachePolicy *ptr = static_cast<GmmLib::GmmGen9CachePolicy*>(pCachePolicy);
142+
GMM_CACHE_POLICY * pCachePolicy = pGmmGlobalContext->GetCachePolicyObj();
143+
GmmLib::GmmGen9CachePolicy *ptr = static_cast<GmmLib::GmmGen9CachePolicy *>(pCachePolicy);
144144
return ptr->CurrentMaxL1HdcMocsIndex;
145145
}
146146

‎Source/GmmLib/CachePolicy/GmmCachePolicyCommon.cpp‎

Lines changed: 103 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -33,101 +33,106 @@ int32_t GmmLib::GmmCachePolicyCommon::RefCount = 0;
3333
// OverrideCachePolicy can take over a minute to compile when optimizations
3434
// are enabled. As this is only needed during init time for non-Release builds,
3535
// we can selectively disable optimizations for this function and improve build times
36-
#if( _DEBUG || _RELEASE_INTERNAL )
36+
#if(_DEBUG || _RELEASE_INTERNAL)
3737
#pragma optimize("", off)
3838
void GmmLib::GmmCachePolicyCommon::OverrideCachePolicy()
3939
{
4040
uint32_t UsageCount = 0;
4141

42-
int32_t DefaultEnable = 0, DefaultLLC = 0, DefaultELLC = 0, DefaultL3 = 0;
43-
int32_t DefaultAge = 0, DefaultWT = 0, DefaultAOM = 0, DefaultLeCC_SCC = 0;
44-
int32_t DefaultL3_SCC = 0, DefaultSCF = 0, DefaultHDCL1 = 0, DefaultSSO = 0;
45-
int32_t DefaultCoS = 0, DefaultL3Eviction = 0;
42+
int32_t DefaultEnable = 0, DefaultLLC = 0, DefaultELLC = 0, DefaultL3 = 0;
43+
int32_t DefaultAge = 0, DefaultWT = 0, DefaultAOM = 0, DefaultLeCC_SCC = 0;
44+
int32_t DefaultL3_SCC = 0, DefaultSCF = 0, DefaultHDCL1 = 0, DefaultSSO = 0;
45+
int32_t DefaultCoS = 0, DefaultL3Eviction = 0;
4646

4747
// Variables used in the REG_OVERRIDE macro block
48-
int32_t Enable = 0, LLC = -1, ELLC = -1, L3 = -1, Age = -1, WT = -1, AOM = -1, LeCC_SCC = -1, L3_SCC = -1, SCF = -1, SSO = -1, CoS = -1, HDCL1 = -1, L3Eviction = -1;
48+
int32_t Enable = 0, LLC = -1, ELLC = -1, L3 = -1, Age = -1, WT = -1, AOM = -1, LeCC_SCC = -1, L3_SCC = -1, SCF = -1, SSO = -1, CoS = -1, HDCL1 = -1, L3Eviction = -1;
4949

50-
#define READ_DEFAULT_OVERRIDE(CacheParam) \
51-
{ \
52-
if (REGISTRY_OVERRIDE_READ(OverrideDefaults ,CacheParam) == false) \
53-
{ \
54-
CacheParam = -1; \
55-
} \
56-
Default##CacheParam = CacheParam; \
50+
#define READ_DEFAULT_OVERRIDE(CacheParam) \
51+
\
52+
{ \
53+
if(REGISTRY_OVERRIDE_READ(OverrideDefaults, CacheParam) == false) \
54+
{ \
55+
CacheParam = -1; \
56+
} \
57+
Default##CacheParam = CacheParam; \
58+
\
5759
}
5860

59-
#define OVERRIDE_DEFAULT(Usage) \
60-
{ \
61-
if (DefaultEnable) \
62-
{ \
63-
if (DefaultLLC != -1) \
64-
{ \
65-
pCachePolicy[Usage].LLC = DefaultLLC; \
66-
} \
67-
if (DefaultELLC != -1) \
68-
{ \
69-
pCachePolicy[Usage].ELLC = DefaultELLC; \
70-
} \
71-
if (DefaultL3 != -1) \
72-
{ \
73-
pCachePolicy[Usage].L3 = DefaultL3; \
74-
} \
75-
if (DefaultAge != -1) \
76-
{ \
77-
pCachePolicy[Usage].AGE = DefaultAge; \
78-
} \
79-
if (DefaultWT != -1) \
80-
{ \
81-
pCachePolicy[Usage].WT = DefaultWT; \
82-
} \
83-
if (DefaultAOM != -1) \
84-
{ \
85-
pCachePolicy[Usage].AOM = DefaultAOM; \
86-
} \
87-
if (DefaultLeCC_SCC != -1) \
88-
{ \
89-
pCachePolicy[Usage].LeCC_SCC = DefaultLeCC_SCC; \
90-
} \
91-
if (DefaultL3_SCC != -1) \
92-
{ \
93-
pCachePolicy[Usage].L3_SCC = DefaultL3_SCC; \
94-
} \
95-
if (DefaultSCF != -1) \
96-
{ \
97-
pCachePolicy[Usage].SCF = DefaultSCF; \
98-
} \
99-
if (DefaultSSO != -1) \
100-
{ \
101-
pCachePolicy[Usage].SSO = DefaultSSO; \
102-
} \
103-
if (DefaultCoS != -1) \
104-
{ \
105-
pCachePolicy[Usage].CoS = DefaultCoS; \
106-
} \
107-
if (DefaultHDCL1 != -1) \
108-
{ \
109-
pCachePolicy[Usage].HDCL1 = DefaultHDCL1; \
110-
} \
111-
if (DefaultL3Eviction != -1) \
112-
{ \
113-
pCachePolicy[Usage].L3Eviction = DefaultL3Eviction; \
114-
} \
115-
} \
61+
#define OVERRIDE_DEFAULT(Usage) \
62+
\
63+
{ \
64+
if(DefaultEnable) \
65+
{ \
66+
if(DefaultLLC != -1) \
67+
{ \
68+
pCachePolicy[Usage].LLC = DefaultLLC; \
69+
} \
70+
if(DefaultELLC != -1) \
71+
{ \
72+
pCachePolicy[Usage].ELLC = DefaultELLC; \
73+
} \
74+
if(DefaultL3 != -1) \
75+
{ \
76+
pCachePolicy[Usage].L3 = DefaultL3; \
77+
} \
78+
if(DefaultAge != -1) \
79+
{ \
80+
pCachePolicy[Usage].AGE = DefaultAge; \
81+
} \
82+
if(DefaultWT != -1) \
83+
{ \
84+
pCachePolicy[Usage].WT = DefaultWT; \
85+
} \
86+
if(DefaultAOM != -1) \
87+
{ \
88+
pCachePolicy[Usage].AOM = DefaultAOM; \
89+
} \
90+
if(DefaultLeCC_SCC != -1) \
91+
{ \
92+
pCachePolicy[Usage].LeCC_SCC = DefaultLeCC_SCC; \
93+
} \
94+
if(DefaultL3_SCC != -1) \
95+
{ \
96+
pCachePolicy[Usage].L3_SCC = DefaultL3_SCC; \
97+
} \
98+
if(DefaultSCF != -1) \
99+
{ \
100+
pCachePolicy[Usage].SCF = DefaultSCF; \
101+
} \
102+
if(DefaultSSO != -1) \
103+
{ \
104+
pCachePolicy[Usage].SSO = DefaultSSO; \
105+
} \
106+
if(DefaultCoS != -1) \
107+
{ \
108+
pCachePolicy[Usage].CoS = DefaultCoS; \
109+
} \
110+
if(DefaultHDCL1 != -1) \
111+
{ \
112+
pCachePolicy[Usage].HDCL1 = DefaultHDCL1; \
113+
} \
114+
if(DefaultL3Eviction != -1) \
115+
{ \
116+
pCachePolicy[Usage].L3Eviction = DefaultL3Eviction; \
117+
} \
118+
} \
119+
\
116120
}
117121

118122
#ifdef __GMM_KMD__
119123
uint32_t GenerateKeys = 0;
120124
REGISTRY_OVERRIDE_READ(, GenerateKeys);
121125
#endif
122-
REGISTRY_OVERRIDE_READ(OverrideDefaults, Enable); DefaultEnable = Enable;
126+
REGISTRY_OVERRIDE_READ(OverrideDefaults, Enable);
127+
DefaultEnable = Enable;
123128

124129
#ifdef __GMM_KMD__
125130
__GMM_ASSERT(!(DefaultEnable && GenerateKeys));
126131
// Disable DefaultEnable if GenerateKeys is enabled
127132
DefaultEnable = GenerateKeys ? 0 : DefaultEnable;
128133
#endif
129134

130-
if (DefaultEnable)
135+
if(DefaultEnable)
131136
{
132137
READ_DEFAULT_OVERRIDE(LLC);
133138
READ_DEFAULT_OVERRIDE(ELLC);
@@ -144,23 +149,26 @@ void GmmLib::GmmCachePolicyCommon::OverrideCachePolicy()
144149
READ_DEFAULT_OVERRIDE(L3Eviction);
145150
}
146151

147-
OVERRIDE_DEFAULT(GMM_RESOURCE_USAGE_UNKNOWN); REG_OVERRIDE(GMM_RESOURCE_USAGE_UNKNOWN);
152+
OVERRIDE_DEFAULT(GMM_RESOURCE_USAGE_UNKNOWN);
153+
REG_OVERRIDE(GMM_RESOURCE_USAGE_UNKNOWN);
148154

149155

150-
#define DEFINE_RESOURCE_USAGE(Usage) OVERRIDE_DEFAULT(Usage); REG_OVERRIDE(Usage);
151-
#include "GmmCachePolicyResourceUsageDefinitions.h"
152-
#undef DEFINE_RESOURCE_USAGE
153-
#undef OVERRIDE_DEFAULT
154-
#undef READ_DEFAULT_OVERRIDE
155-
__GMM_ASSERT(UsageCount == GMM_RESOURCE_USAGE_MAX);
156+
#define DEFINE_RESOURCE_USAGE(Usage) \
157+
OVERRIDE_DEFAULT(Usage); \
158+
REG_OVERRIDE(Usage);
159+
#include "GmmCachePolicyResourceUsageDefinitions.h"
160+
#undef DEFINE_RESOURCE_USAGE
161+
#undef OVERRIDE_DEFAULT
162+
#undef READ_DEFAULT_OVERRIDE
163+
__GMM_ASSERT(UsageCount == GMM_RESOURCE_USAGE_MAX);
156164

157-
#ifdef __GMM_KMD__
158-
if (GenerateKeys)
159-
{
160-
GenerateKeys = 0;
161-
REGISTRY_OVERRIDE_WRITE(, GenerateKeys, GenerateKeys);
162-
}
163-
#endif
165+
#ifdef __GMM_KMD__
166+
if(GenerateKeys)
167+
{
168+
GenerateKeys = 0;
169+
REGISTRY_OVERRIDE_WRITE(, GenerateKeys, GenerateKeys);
170+
}
171+
#endif
164172
}
165173
#pragma optimize("", on)
166174
#endif
@@ -186,11 +194,11 @@ GmmLib::GmmCachePolicyCommon::GmmCachePolicyCommon(GMM_CACHE_POLICY_ELEMENT *pCa
186194
GMM_GFX_MEMORY_TYPE GmmLib::GmmCachePolicyCommon::GetWantedMemoryType(GMM_CACHE_POLICY_ELEMENT CachePolicy)
187195
{
188196
GMM_GFX_MEMORY_TYPE WantedMemoryType = GMM_GFX_UC_WITH_FENCE;
189-
if (CachePolicy.WT)
197+
if(CachePolicy.WT)
190198
{
191199
WantedMemoryType = GMM_GFX_WT;
192200
}
193-
else if (!(CachePolicy.LLC || CachePolicy.ELLC))
201+
else if(!(CachePolicy.LLC || CachePolicy.ELLC))
194202
{
195203
WantedMemoryType = GMM_GFX_UC_WITH_FENCE;
196204
}
@@ -214,7 +222,7 @@ MEMORY_OBJECT_CONTROL_STATE GMM_STDCALL GmmLib::GmmCachePolicyCommon::CachePolic
214222
{
215223
MEMORY_OBJECT_CONTROL_STATE MOCS = pGmmGlobalContext->GetCachePolicyElement(GMM_RESOURCE_USAGE_UNKNOWN).MemoryObjectOverride;
216224

217-
if (pResInfo)
225+
if(pResInfo)
218226
{
219227
MOCS = pResInfo->GetMOCS();
220228
}
@@ -241,16 +249,16 @@ MEMORY_OBJECT_CONTROL_STATE GMM_STDCALL GmmLib::GmmCachePolicyCommon::CachePolic
241249

242250
// Prevent wrong Usage for XAdapter resources. UMD does not call GetMemoryObject on shader resources but,
243251
// when they add it someone could call it without knowing the restriction.
244-
if (pResInfo &&
245-
pResInfo->GetResFlags().Info.XAdapter &&
246-
Usage != GMM_RESOURCE_USAGE_XADAPTER_SHARED_RESOURCE)
252+
if(pResInfo &&
253+
pResInfo->GetResFlags().Info.XAdapter &&
254+
Usage != GMM_RESOURCE_USAGE_XADAPTER_SHARED_RESOURCE)
247255
{
248256
__GMM_ASSERT(false);
249257
}
250258

251-
if (!pResInfo ||
252-
(CachePolicy[Usage].Override & CachePolicy[pResInfo->GetCachePolicyUsage()].IDCode) ||
253-
(CachePolicy[Usage].Override == ALWAYS_OVERRIDE))
259+
if(!pResInfo ||
260+
(CachePolicy[Usage].Override & CachePolicy[pResInfo->GetCachePolicyUsage()].IDCode) ||
261+
(CachePolicy[Usage].Override == ALWAYS_OVERRIDE))
254262
{
255263
return CachePolicy[Usage].MemoryObjectOverride;
256264
}

0 commit comments

Comments
 (0)