Skip to content

Commit 0ea5dce

Browse files
kartnemakartnema
authored
Signal Opcode Changes (#143)
--- Signed-off-by: Kartik Nema <kartnema@qti.qualcomm.com>
1 parent e2b12fb commit 0ea5dce

8 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎contextual-classifier/ContextualClassifier.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ void ContextualClassifier::ClassifierMain() {
204204

205205
if(ev.type == CC_APP_OPEN) {
206206
std::string comm;
207-
uint32_t sigId = CONSTRUCT_SIG_CODE(URM_SIG_APP_OPEN, URM_SIG_CAT_GENERIC);
207+
uint32_t sigId = CONSTRUCT_SIG_CODE(URM_SIG_CAT_GENERIC, URM_SIG_APP_OPEN);
208208
uint32_t sigType = DEFAULT_SIGNAL_TYPE;
209209
uint32_t ctxDetails = 0U;
210210

@@ -367,17 +367,17 @@ void ContextualClassifier::RemoveActions(pid_t processPid, pid_t processTgid) {
367367
uint32_t ContextualClassifier::GetSignalIDForWorkload(int32_t contextType) {
368368
switch(contextType) {
369369
case CC_MULTIMEDIA:
370-
return CONSTRUCT_SIG_CODE(URM_SIG_MULTIMEDIA_APP_OPEN, URM_SIG_CAT_MULTIMEDIA);
370+
return CONSTRUCT_SIG_CODE(URM_SIG_CAT_MULTIMEDIA, URM_SIG_MULTIMEDIA_APP_OPEN);
371371
case CC_GAME:
372-
return CONSTRUCT_SIG_CODE(URM_SIG_GAME_APP_OPEN, URM_SIG_CAT_GAMING);
372+
return CONSTRUCT_SIG_CODE(URM_SIG_CAT_GAMING, URM_SIG_GAME_APP_OPEN);
373373
case CC_BROWSER:
374-
return CONSTRUCT_SIG_CODE(URM_SIG_BROWSER_APP_OPEN, URM_SIG_CAT_BROWSER);
374+
return CONSTRUCT_SIG_CODE(URM_SIG_CAT_BROWSER, URM_SIG_BROWSER_APP_OPEN);
375375
default:
376376
break;
377377
}
378378

379379
// CC_APP
380-
return CONSTRUCT_SIG_CODE(URM_SIG_APP_OPEN, URM_SIG_CAT_GENERIC);
380+
return CONSTRUCT_SIG_CODE(URM_SIG_CAT_GENERIC, URM_SIG_APP_OPEN);
381381
}
382382

383383
void ContextualClassifier::LoadIgnoredProcesses() {

‎docs/Examples/SignalAPIsExamples.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void func1() {
5656

5757
/*
5858
* Alternative Approach to construct opcode
59-
* sigCode = CUSTOM(CONSTRUCT_SIG_CODE(0x0003, 0x0d))
59+
* sigCode = CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0003))
6060
*/
6161

6262
// Duration to tune the signal for

‎docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ Signals are identified (similar to Resources) via an unsigned 32-bit integer.
602602

603603
The macro "CONSTRUCT_SIG_CODE" can be used for generating opcodes directly if the ResType and ResID are known:
604604
```cpp
605-
uint32_t sigCode = CONSTRUCT_SIG_CODE(0x0008, 0x0d);
605+
uint32_t sigCode = CONSTRUCT_SIG_CODE(0x0d, 0x0008);
606606
```
607607

608608
### 4.2.5. untuneSignal

‎docs/UserGuide/HOW-TO.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ Hence, the resulting sigCode for this signal is:
208208

209209
The macro "CONSTRUCT_SIG_CODE" can be used for generating opcodes directly if the ResType and ResID are known:
210210
```cpp
211-
uint32_t sigCode = CONSTRUCT_SIG_CODE(0x0008, 0x0d);
211+
uint32_t sigCode = CONSTRUCT_SIG_CODE(0x0d, 0x0008);
212212
```
213213

214214
If the resource is user-defined / custom then the MSB must be set to 1, so that the resource can
215215
be correctly identified. The CUSTOM function macro achieves this.
216216

217217
```cpp
218-
uint32_t sigCode = CUSTOM(CONSTRUCT_SIG_CODE(0x0008, 0x0d));
218+
uint32_t sigCode = CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0008));
219219
```

‎modula/Common/Include/UrmPlatformAL.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ enum Modes {
135135
resourceBitmap; \
136136
}) \
137137

138-
#define CONSTRUCT_SIG_CODE(sigID, category) ({ \
138+
#define CONSTRUCT_SIG_CODE(sigCat, sigID) ({ \
139139
uint32_t signalBitmap = 0; \
140-
signalBitmap |= ((uint32_t)category); \
141-
signalBitmap |= ((uint32_t)sigID << 8); \
140+
signalBitmap |= ((uint32_t)sigID); \
141+
signalBitmap |= ((uint32_t)sigCat << 16); \
142142
signalBitmap; \
143143
}) \
144144

‎resource-tuner/signals/SignalRegistry.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ void SignalRegistry::registerSignal(SignalInfo* signalInfo, int8_t isBuSpecified
5050
}
5151

5252
uint64_t signalBitmap = 0;
53-
signalBitmap |= ((uint32_t)signalInfo->mSignalID << 8);
54-
signalBitmap |= ((uint32_t)signalInfo->mSignalCategory);
53+
signalBitmap |= ((uint32_t)signalInfo->mSignalID);
54+
signalBitmap |= ((uint32_t)signalInfo->mSignalCategory << 16);
5555

5656
// Add the sub-type
5757
signalBitmap <<= 32; // Make Room

‎tests/Component/ParserTests.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ namespace SignalParsingTests {
134134

135135
MT_TEST(SignalParsingTests, RestuneParserYAMLDataIntegrity3_1, "component-serial") {
136136
EnsureInit();
137-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x0000000d);
137+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x000d0000);
138138

139139
MT_REQUIRE(ctx, signalInfo != nullptr);
140140
MT_REQUIRE_EQ(ctx, signalInfo->mSignalID, 0);
@@ -163,7 +163,7 @@ namespace SignalParsingTests {
163163

164164
MT_TEST(SignalParsingTests, RestuneParserYAMLDataIntegrity3_2, "component-serial") {
165165
EnsureInit();
166-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x0000010d);
166+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x000d0001);
167167

168168
MT_REQUIRE(ctx, signalInfo != nullptr);
169169
MT_REQUIRE_EQ(ctx, signalInfo->mSignalID, 1);
@@ -198,13 +198,13 @@ namespace SignalParsingTests {
198198

199199
MT_TEST(SignalParsingTests, RestuneParserYAMLDataIntegrity3_3, "component-serial") {
200200
EnsureInit();
201-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x0000030d);
201+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x000d0003);
202202
MT_REQUIRE_EQ(ctx, signalInfo, (SignalInfo*)nullptr);
203203
}
204204

205205
MT_TEST(SignalParsingTests, RestuneParserYAMLDataIntegrity3_4, "component-serial") {
206206
EnsureInit();
207-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x0000070d);
207+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x000d0007);
208208

209209
MT_REQUIRE(ctx, signalInfo != nullptr);
210210
MT_REQUIRE_EQ(ctx, signalInfo->mSignalID, 0x0007);
@@ -684,7 +684,7 @@ namespace SignalParsingTestsAddOn {
684684

685685
MT_TEST(SignalParsingTestsAddOn, SignalParsingSignalsMerged1, "component-serial") {
686686
EnsureInit();
687-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x80aaddde);
687+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x80deaadd);
688688

689689
MT_REQUIRE(ctx, (signalInfo != nullptr));
690690
MT_REQUIRE_EQ(ctx, signalInfo->mSignalID, 0xaadd);
@@ -712,7 +712,7 @@ namespace SignalParsingTestsAddOn {
712712

713713
MT_TEST(SignalParsingTestsAddOn, SignalParsingSignalsMerged2, "component-serial") {
714714
EnsureInit();
715-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x0000070d);
715+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x000d0007);
716716

717717
MT_REQUIRE(ctx, signalInfo != nullptr);
718718
MT_REQUIRE_EQ(ctx, signalInfo->mSignalID, 0x0007);
@@ -749,7 +749,7 @@ namespace SignalParsingTestsAddOn {
749749

750750
MT_TEST(SignalParsingTestsAddOn, SignalParsingSignalsMerged3, "component-serial") {
751751
EnsureInit();
752-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x8000ab1e);
752+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x801e00ab);
753753

754754
MT_REQUIRE(ctx, signalInfo != nullptr);
755755
MT_REQUIRE_EQ(ctx, signalInfo->mSignalID, 0x00ab);
@@ -784,13 +784,13 @@ namespace SignalParsingTestsAddOn {
784784

785785
MT_TEST(SignalParsingTestsAddOn, SignalParsingSignalsMerged4, "component-serial") {
786786
EnsureInit();
787-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x00000008);
787+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x00080000);
788788
MT_REQUIRE_EQ(ctx, (signalInfo), (SignalInfo*)nullptr);
789789
}
790790

791791
MT_TEST(SignalParsingTestsAddOn, SignalParsingSignalsMerged5, "component-serial") {
792792
EnsureInit();
793-
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x80ffcfce);
793+
SignalInfo* signalInfo = SignalRegistry::getInstance()->getSignalConfigById(0x80ceffcf);
794794

795795
MT_REQUIRE(ctx, (signalInfo != nullptr));
796796
MT_REQUIRE_EQ(ctx, signalInfo->mSignalID, 0xffcf);

‎tests/Integration/IntegrationTests.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ MT_TEST(Integration, SignalTestOutOfBoundsResourceTuning, "signal-verification")
421421

422422
int64_t handle =
423423
tuneSignal(
424-
CUSTOM(CONSTRUCT_SIG_CODE(0x0002, 0x0d)),
424+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0002)),
425425
DEFAULT_SIGNAL_TYPE,
426426
5000,
427427
RequestPriority::REQ_PRIORITY_HIGH,
@@ -451,7 +451,7 @@ MT_TEST(Integration, SignalTestTargetCompatabilityVerificationChecks, "signal-ve
451451
MT_REQUIRE_EQ(ctx, originalValue, testResourceOriginalValue);
452452

453453
int64_t handle = tuneSignal(
454-
CUSTOM(CONSTRUCT_SIG_CODE(0x0000, 0x0d)),
454+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0000)),
455455
DEFAULT_SIGNAL_TYPE,
456456
5000,
457457
RequestPriority::REQ_PRIORITY_HIGH,
@@ -481,7 +481,7 @@ MT_TEST(Integration, SignalTestNonSupportedSignalProvisioningVerification, "sign
481481
MT_REQUIRE_EQ(ctx, originalValue, testResourceOriginalValue);
482482

483483
int64_t handle = tuneSignal(
484-
CUSTOM(CONSTRUCT_SIG_CODE(0x0003, 0x0d)),
484+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0003)),
485485
DEFAULT_SIGNAL_TYPE,
486486
5000,
487487
RequestPriority::REQ_PRIORITY_HIGH,
@@ -1490,7 +1490,7 @@ MT_TEST(SignalApplicationTests, TestSingleClientTuneSignal1, "Integration") {
14901490
originalValue = C_STOI(value);
14911491
int64_t handle =
14921492
tuneSignal(
1493-
CUSTOM(CONSTRUCT_SIG_CODE(0x0004, 0x0d)),
1493+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0004)),
14941494
DEFAULT_SIGNAL_TYPE,
14951495
5000,
14961496
RequestPriority::REQ_PRIORITY_HIGH,
@@ -1533,7 +1533,7 @@ MT_TEST(SignalApplicationTests, TestSingleClientTuneSignal2, "Integration") {
15331533
MT_REQUIRE_EQ(ctx, originalValue, originalValues[2]);
15341534
int64_t handle =
15351535
tuneSignal(
1536-
CUSTOM(CONSTRUCT_SIG_CODE(0x0005, 0x0d)),
1536+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0005)),
15371537
DEFAULT_SIGNAL_TYPE,
15381538
5000,
15391539
RequestPriority::REQ_PRIORITY_HIGH,
@@ -1585,7 +1585,7 @@ MT_TEST(SignalApplicationTests, TestSignalUntuning, "Integration") {
15851585
// Apply signal
15861586
int64_t handle =
15871587
tuneSignal(
1588-
CUSTOM(CONSTRUCT_SIG_CODE(0x0004, 0x0d)),
1588+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0004)),
15891589
DEFAULT_SIGNAL_TYPE,
15901590
-1,
15911591
RequestPriority::REQ_PRIORITY_HIGH,
@@ -1657,7 +1657,7 @@ MT_TEST(SignalApplicationTests, TestObservationSignal, "Integration") {
16571657

16581658
// Apply observation signal
16591659
int64_t handle = tuneSignal(
1660-
CUSTOM(CONSTRUCT_SIG_CODE(0x0009, 0x0d)),
1660+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x0009)),
16611661
DEFAULT_SIGNAL_TYPE,
16621662
0, 0, "", "",
16631663
3,
@@ -1732,7 +1732,7 @@ MT_TEST(SignalApplicationTests, TestMultiResourceSignal, "Integration") {
17321732

17331733
// Apply the multi-resource signal
17341734
int64_t handle = tuneSignal(
1735-
CUSTOM(CONSTRUCT_SIG_CODE(0x000a, 0x0d)),
1735+
CUSTOM(CONSTRUCT_SIG_CODE(0x0d, 0x000a)),
17361736
DEFAULT_SIGNAL_TYPE,
17371737
/*target*/ 0,
17381738
/*flags*/ 0,

0 commit comments

Comments
 (0)