Skip to content

Commit 2e23224

Browse files
committed
workaround osx compilation issue
Change-Id: I72cfab7efac104b93dfc8669a7c6cca1624008d1
1 parent d62b995 commit 2e23224

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/topologyentry.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,17 @@ struct PCM_API TopologyEntry // describes a core
116116

117117
inline void fillEntry(TopologyEntry & entry, const uint32 & smtMaskWidth, const uint32 & coreMaskWidth, const uint32 & l2CacheMaskShift, const int apic_id)
118118
{
119+
#ifndef USER_KERNEL_SHARED
119120
DBG(1, "entry.os_id = ", entry.os_id, " apic_id = ", apic_id);
121+
#endif
120122
entry.thread_id = smtMaskWidth ? extract_bits_32(apic_id, 0, smtMaskWidth - 1) : 0;
121123
entry.core_id = coreMaskWidth ? extract_bits_32(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;
122124
entry.socket_id = extract_bits_32(apic_id, smtMaskWidth + coreMaskWidth, 31);
123125
entry.tile_id = extract_bits_32(apic_id, l2CacheMaskShift, 31);
124126
entry.socket_unique_core_id = entry.core_id;
127+
#ifndef USER_KERNEL_SHARED
125128
DBG(1, "entry.os_id = ", entry.os_id, " apic_id = ", apic_id, " entry.thread_id = ", entry.thread_id, " entry.core_id = ", entry.core_id, " entry.socket_id = ", entry.socket_id , " entry.tile_id = ", entry.tile_id, " entry.socket_unique_core_id = ", entry.socket_unique_core_id);
129+
#endif
126130
}
127131

128132
inline bool initCoreMasks(uint32 & smtMaskWidth, uint32 & coreMaskWidth, uint32 & l2CacheMaskShift, uint32 & l3CacheMaskShift)
@@ -145,7 +149,9 @@ inline bool initCoreMasks(uint32 & smtMaskWidth, uint32 & coreMaskWidth, uint32
145149
}
146150
levelType = extract_bits_32(cpuid_args.array[2], 8, 15);
147151
levelShift = extract_bits_32(cpuid_args.array[0], 0, 4);
148-
DBG(1, "levelType = ", levelType, " levelShift = ", levelShift);
152+
#ifndef USER_KERNEL_SHARED
153+
DBG(1, "levelType = ", levelType, " levelShift = ", levelShift);
154+
#endif
149155
switch (levelType)
150156
{
151157
case 1: //level type is SMT, so levelShift is the SMT_Mask_Width
@@ -254,7 +260,9 @@ inline bool initCoreMasks(uint32 & smtMaskWidth, uint32 & coreMaskWidth, uint32
254260
}
255261
#endif
256262
}
263+
#ifndef USER_KERNEL_SHARED
257264
DBG(1, "smtMaskWidth = ", smtMaskWidth, " coreMaskWidth = ", coreMaskWidth, " l2CacheMaskShift = ", l2CacheMaskShift, " l3CacheMaskShift = ", l3CacheMaskShift);
265+
#endif
258266
return true;
259267
}
260268

0 commit comments

Comments
 (0)