Skip to content

Commit c4421b3

Browse files
cyringcyring
committed
Monitoring GRAPHICS_PERF_LIMIT_REASONS & RING_PERF_LIMIT_REASONS
1 parent c6a40a4 commit c4421b3

File tree

9 files changed

+430
-136
lines changed

9 files changed

+430
-136
lines changed

‎corefreq-cli-rsc-en.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,6 +1673,7 @@
16731673

16741674
#define RSC_BOX_EVENT_TITLE_CODE_EN " Clear Event "
16751675

1676+
#define RSC_BOX_EVENT_SPACE_CODE_EN " "
16761677
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_EN " Thermal Sensor "
16771678
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_EN " PROCHOT# Agent "
16781679
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_EN " Critical Temperature "

‎corefreq-cli-rsc-fr.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,7 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
11621162
#define RSC_BOX_EVENT_TITLE_CODE_FR " Effacer " \
11631163
"\x89""v""\xa8""nement "
11641164

1165+
#define RSC_BOX_EVENT_SPACE_CODE_FR " "
11651166
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_FR " Capteur thermique "
11661167
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_FR " Agent PROCHOT# "
11671168
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_FR " Temp""\xa9""rature" \

‎corefreq-cli-rsc.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,6 +1595,7 @@ RESOURCE_ST Resource[] = {
15951595
LDT(RSC_BOX_OPS_UNREGISTER_COND0),
15961596
LDT(RSC_BOX_OPS_UNREGISTER_COND1),
15971597
LDT(RSC_BOX_EVENT_TITLE),
1598+
LDT(RSC_BOX_EVENT_SPACE),
15981599
LDT(RSC_BOX_EVENT_THERMAL_SENSOR),
15991600
LDT(RSC_BOX_EVENT_PROCHOT_AGENT),
16001601
LDT(RSC_BOX_EVENT_CRITICAL_TEMP),

‎corefreq-cli-rsc.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,7 @@ enum {
13991399
RSC_BOX_OPS_UNREGISTER_COND0,
14001400
RSC_BOX_OPS_UNREGISTER_COND1,
14011401
RSC_BOX_EVENT_TITLE,
1402+
RSC_BOX_EVENT_SPACE,
14021403
RSC_BOX_EVENT_THERMAL_SENSOR,
14031404
RSC_BOX_EVENT_PROCHOT_AGENT,
14041405
RSC_BOX_EVENT_CRITICAL_TEMP,

‎corefreq-cli.c‎

Lines changed: 84 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11026,6 +11026,7 @@ int Shortcut(SCANKEY *scan)
1102611026

1102711027
Window *wBox = CreateBox(scan->key, origin, select,
1102811028
(char*) RSC(BOX_EVENT_TITLE).CODE(),
11029+
/* Section: */
1102911030
/* Thermal Sensor */
1103011031
RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
1103111032
RSC(BOX_EVENT).ATTR()[
@@ -11068,30 +11069,90 @@ int Shortcut(SCANKEY *scan)
1106811069
(ProcessorEvents & EVENT_CROSS_DOMAIN) ? 1 : 0
1106911070
],
1107011071
BOXKEY_CLR_X_DOMAIN,
11072+
/* Section: */
11073+
RSC(BOX_EVENT_SPACE).CODE(),
11074+
RSC(BOX_EVENT).ATTR()[0],
11075+
SCANKEY_NULL,
1107111076
/* Package PL1 */
1107211077
RSC(BOX_EVENT_POWER_PL1).CODE(),
1107311078
RSC(BOX_EVENT).ATTR()[
11074-
(ProcessorEvents & EVENT_POWER_PL1) ? 2 : 0
11079+
(ProcessorEvents & EVENT_CORE_PL1) ? 2 : 0
1107511080
],
11076-
BOXKEY_CLR_PWR_PL1,
11081+
BOXKEY_CLR_CORE_PL1,
1107711082
/* Package PL2 */
1107811083
RSC(BOX_EVENT_POWER_PL2).CODE(),
1107911084
RSC(BOX_EVENT).ATTR()[
11080-
(ProcessorEvents & EVENT_POWER_PL2) ? 2 : 0
11085+
(ProcessorEvents & EVENT_CORE_PL2) ? 2 : 0
1108111086
],
11082-
BOXKEY_CLR_PWR_PL2,
11087+
BOXKEY_CLR_CORE_PL2,
1108311088
/* Electrical EDP */
1108411089
RSC(BOX_EVENT_ELECTRICAL).CODE(),
1108511090
RSC(BOX_EVENT).ATTR()[
11086-
(ProcessorEvents & EVENT_ELECTRICAL) ? 2 : 0
11091+
(ProcessorEvents & EVENT_CORE_EDP) ? 2 : 0
1108711092
],
11088-
BOXKEY_CLR_ELECTRICAL,
11093+
BOXKEY_CLR_CORE_EDP,
1108911094
/* Max Turbo Limit. */
1109011095
RSC(BOX_EVENT_MAX_TURBO).CODE(),
1109111096
RSC(BOX_EVENT).ATTR()[
11092-
(ProcessorEvents & EVENT_MAX_TURBO) ? 2 : 0
11097+
(ProcessorEvents & EVENT_CORE_TURBO) ? 2 : 0
11098+
],
11099+
BOXKEY_CLR_CORE_TURBO,
11100+
/* Section: */
11101+
RSC(BOX_EVENT_SPACE).CODE(),
11102+
RSC(BOX_EVENT).ATTR()[0],
11103+
SCANKEY_NULL,
11104+
/* Thermal Sensor */
11105+
RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
11106+
RSC(BOX_EVENT).ATTR()[
11107+
(ProcessorEvents & EVENT_GFX_THM) ? 2 : 0
11108+
],
11109+
BOXKEY_CLR_GFX_THM,
11110+
/* Package PL1 */
11111+
RSC(BOX_EVENT_POWER_PL1).CODE(),
11112+
RSC(BOX_EVENT).ATTR()[
11113+
(ProcessorEvents & EVENT_GFX_PL1) ? 2 : 0
11114+
],
11115+
BOXKEY_CLR_GFX_PL1,
11116+
/* Package PL2 */
11117+
RSC(BOX_EVENT_POWER_PL2).CODE(),
11118+
RSC(BOX_EVENT).ATTR()[
11119+
(ProcessorEvents & EVENT_GFX_PL2) ? 2 : 0
11120+
],
11121+
BOXKEY_CLR_GFX_PL2,
11122+
/* Electrical EDP */
11123+
RSC(BOX_EVENT_ELECTRICAL).CODE(),
11124+
RSC(BOX_EVENT).ATTR()[
11125+
(ProcessorEvents & EVENT_GFX_EDP) ? 2 : 0
11126+
],
11127+
BOXKEY_CLR_GFX_EDP,
11128+
/* Section: */
11129+
RSC(BOX_EVENT_SPACE).CODE(),
11130+
RSC(BOX_EVENT).ATTR()[0],
11131+
SCANKEY_NULL,
11132+
/* Thermal Sensor */
11133+
RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
11134+
RSC(BOX_EVENT).ATTR()[
11135+
(ProcessorEvents & EVENT_RING_THM) ? 2 : 0
11136+
],
11137+
BOXKEY_CLR_RING_THM,
11138+
/* Package PL1 */
11139+
RSC(BOX_EVENT_POWER_PL1).CODE(),
11140+
RSC(BOX_EVENT).ATTR()[
11141+
(ProcessorEvents & EVENT_RING_PL1) ? 2 : 0
11142+
],
11143+
BOXKEY_CLR_RING_PL1,
11144+
/* Package PL2 */
11145+
RSC(BOX_EVENT_POWER_PL2).CODE(),
11146+
RSC(BOX_EVENT).ATTR()[
11147+
(ProcessorEvents & EVENT_RING_PL2) ? 2 : 0
11148+
],
11149+
BOXKEY_CLR_RING_PL2,
11150+
/* Electrical EDP */
11151+
RSC(BOX_EVENT_ELECTRICAL).CODE(),
11152+
RSC(BOX_EVENT).ATTR()[
11153+
(ProcessorEvents & EVENT_RING_EDP) ? 2 : 0
1109311154
],
11094-
BOXKEY_CLR_MAX_TURBO);
11155+
BOXKEY_CLR_RING_EDP);
1109511156
if (wBox != NULL) {
1109611157
AppendWindow(wBox, &winList);
1109711158
} else {
@@ -13319,10 +13380,18 @@ int Shortcut(SCANKEY *scan)
1331913380
case BOXKEY_CLR_PWR_LIMIT:
1332013381
case BOXKEY_CLR_CUR_LIMIT:
1332113382
case BOXKEY_CLR_X_DOMAIN:
13322-
case BOXKEY_CLR_PWR_PL1:
13323-
case BOXKEY_CLR_PWR_PL2:
13324-
case BOXKEY_CLR_ELECTRICAL:
13325-
case BOXKEY_CLR_MAX_TURBO:
13383+
case BOXKEY_CLR_CORE_PL1:
13384+
case BOXKEY_CLR_CORE_PL2:
13385+
case BOXKEY_CLR_CORE_EDP:
13386+
case BOXKEY_CLR_CORE_TURBO:
13387+
case BOXKEY_CLR_GFX_THM:
13388+
case BOXKEY_CLR_GFX_PL1:
13389+
case BOXKEY_CLR_GFX_PL2:
13390+
case BOXKEY_CLR_GFX_EDP:
13391+
case BOXKEY_CLR_RING_THM:
13392+
case BOXKEY_CLR_RING_PL1:
13393+
case BOXKEY_CLR_RING_PL2:
13394+
case BOXKEY_CLR_RING_EDP:
1332613395
{
1332713396
const enum EVENT_ENUM lshift = (scan->key & CLEAR_EVENT_MASK) >> 2;
1332813397
const enum THERM_PWR_EVENTS event = 0x1 << lshift;
@@ -17689,9 +17758,9 @@ void Draw_Footer(Layer *layer, CUINT row)
1768917758
| EVENT_THERM_PROCHOT
1769017759
| EVENT_THERM_CRIT
1769117760
| EVENT_THERM_THOLD
17692-
| EVENT_POWER_PL1
17693-
| EVENT_POWER_PL2
17694-
| EVENT_ELECTRICAL ) )
17761+
| EVENT_CORE_PL1
17762+
| EVENT_CORE_PL2
17763+
| EVENT_CORE_EDP ) )
1769517764
{
1769617765
_hot = 4;
1769717766
_tmp = 1;

‎corefreq-cli.h‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,18 @@ enum KEY_ENUM {
292292
BOXKEY_CLR_PWR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_POWER_LIMIT << 2),
293293
BOXKEY_CLR_CUR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_CURRENT_LIMIT << 2),
294294
BOXKEY_CLR_X_DOMAIN = BOXKEY_EVT_OR | (LSHIFT_CROSS_DOMAIN << 2),
295-
BOXKEY_CLR_PWR_PL1 = BOXKEY_EVT_OR | (LSHIFT_POWER_PL1 << 2),
296-
BOXKEY_CLR_PWR_PL2 = BOXKEY_EVT_OR | (LSHIFT_POWER_PL2 << 2),
297-
BOXKEY_CLR_ELECTRICAL = BOXKEY_EVT_OR | (LSHIFT_ELECTRICAL << 2),
298-
BOXKEY_CLR_MAX_TURBO = BOXKEY_EVT_OR | (LSHIFT_MAX_TURBO << 2),
295+
BOXKEY_CLR_CORE_PL1 = BOXKEY_EVT_OR | (LSHIFT_CORE_PL1 << 2),
296+
BOXKEY_CLR_CORE_PL2 = BOXKEY_EVT_OR | (LSHIFT_CORE_PL2 << 2),
297+
BOXKEY_CLR_CORE_EDP = BOXKEY_EVT_OR | (LSHIFT_CORE_EDP << 2),
298+
BOXKEY_CLR_CORE_TURBO = BOXKEY_EVT_OR | (LSHIFT_CORE_TURBO << 2),
299+
BOXKEY_CLR_GFX_THM = BOXKEY_EVT_OR | (LSHIFT_GFX_THM << 2),
300+
BOXKEY_CLR_GFX_PL1 = BOXKEY_EVT_OR | (LSHIFT_GFX_PL1 << 2),
301+
BOXKEY_CLR_GFX_PL2 = BOXKEY_EVT_OR | (LSHIFT_GFX_PL2 << 2),
302+
BOXKEY_CLR_GFX_EDP = BOXKEY_EVT_OR | (LSHIFT_GFX_EDP << 2),
303+
BOXKEY_CLR_RING_THM = BOXKEY_EVT_OR | (LSHIFT_RING_THM << 2),
304+
BOXKEY_CLR_RING_PL1 = BOXKEY_EVT_OR | (LSHIFT_RING_PL1 << 2),
305+
BOXKEY_CLR_RING_PL2 = BOXKEY_EVT_OR | (LSHIFT_RING_PL2 << 2),
306+
BOXKEY_CLR_RING_EDP = BOXKEY_EVT_OR | (LSHIFT_RING_EDP << 2),
299307

300308
BOXKEY_TDP_PKG = BOXKEY_TDP_OR | (PWR_DOMAIN(PKG) << 5),
301309
BOXKEY_TDP_CORES = BOXKEY_TDP_OR | (PWR_DOMAIN(CORES) << 5),
@@ -622,10 +630,18 @@ int CheckDuplicateKey(void) \
622630
case BOXKEY_CLR_PWR_LIMIT: \
623631
case BOXKEY_CLR_CUR_LIMIT: \
624632
case BOXKEY_CLR_X_DOMAIN: \
625-
case BOXKEY_CLR_PWR_PL1: \
626-
case BOXKEY_CLR_PWR_PL2: \
627-
case BOXKEY_CLR_ELECTRICAL: \
628-
case BOXKEY_CLR_MAX_TURBO: \
633+
case BOXKEY_CLR_CORE_PL1: \
634+
case BOXKEY_CLR_CORE_PL2: \
635+
case BOXKEY_CLR_CORE_EDP: \
636+
case BOXKEY_CLR_CORE_TURBO: \
637+
case BOXKEY_CLR_GFX_THM: \
638+
case BOXKEY_CLR_GFX_PL1: \
639+
case BOXKEY_CLR_GFX_PL2: \
640+
case BOXKEY_CLR_GFX_EDP: \
641+
case BOXKEY_CLR_RING_THM: \
642+
case BOXKEY_CLR_RING_PL1: \
643+
case BOXKEY_CLR_RING_PL2: \
644+
case BOXKEY_CLR_RING_EDP: \
629645
\
630646
case BOXKEY_TDP_PKG: \
631647
case BOXKEY_TDP_CORES: \

0 commit comments

Comments
 (0)