Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update JS perf tests for changed util classes" into tm-mainline-prod

Browse Source
This commit is contained in:
Kevin Tjen
2023-03-31 07:16:24 +00:00
committed by Android (Google) Code Review
parent b67d221a8d 2677f46c69
commit 3d38535853
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apct-tests/perftests/rubidium/src/android/rubidium/js/JSScriptEnginePerfTests.java
View File

@@ -45,11 +45,13 @@ import androidx.test.filters.MediumTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.adservices.data.adselection.CustomAudienceSignals; import com.android.adservices.data.adselection.CustomAudienceSignals;
import com.android.adservices.service.adselection.AdDataArgument; import com.android.adservices.service.adselection.AdCounterKeyCopier;
import com.android.adservices.service.adselection.AdSelectionConfigArgument; import com.android.adservices.service.adselection.AdCounterKeyCopierNoOpImpl;
import com.android.adservices.service.adselection.AdWithBidArgument; import com.android.adservices.service.adselection.AdDataArgumentUtil;
import com.android.adservices.service.adselection.CustomAudienceBiddingSignalsArgument; import com.android.adservices.service.adselection.AdSelectionConfigArgumentUtil;
import com.android.adservices.service.adselection.CustomAudienceScoringSignalsArgument; import com.android.adservices.service.adselection.AdWithBidArgumentUtil;
import com.android.adservices.service.adselection.CustomAudienceBiddingSignalsArgumentUtil;
import com.android.adservices.service.adselection.CustomAudienceScoringSignalsArgumentUtil;
import com.android.adservices.service.js.IsolateSettings; import com.android.adservices.service.js.IsolateSettings;
import com.android.adservices.service.js.JSScriptArgument; import com.android.adservices.service.js.JSScriptArgument;
import com.android.adservices.service.js.JSScriptArrayArgument; import com.android.adservices.service.js.JSScriptArrayArgument;
@@ -106,6 +108,14 @@ public class JSScriptEnginePerfTests {
private static final Instant ACTIVATION_TIME = CLOCK.instant(); private static final Instant ACTIVATION_TIME = CLOCK.instant();
private static final Instant EXPIRATION_TIME = CLOCK.instant().plus(Duration.ofDays(1)); private static final Instant EXPIRATION_TIME = CLOCK.instant().plus(Duration.ofDays(1));
private static final AdSelectionSignals CONTEXTUAL_SIGNALS = AdSelectionSignals.EMPTY; private static final AdSelectionSignals CONTEXTUAL_SIGNALS = AdSelectionSignals.EMPTY;
private static final AdCounterKeyCopier AD_COUNTER_KEY_COPIER_NO_OP =
new AdCounterKeyCopierNoOpImpl();
private final AdDataArgumentUtil mAdDataArgumentUtil =
new AdDataArgumentUtil(AD_COUNTER_KEY_COPIER_NO_OP);
private final AdWithBidArgumentUtil mAdWithBidArgumentUtil =
new AdWithBidArgumentUtil(mAdDataArgumentUtil);
@Rule @Rule
public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
@@ -437,7 +447,7 @@ public class JSScriptEnginePerfTests {
List<AdData> adDataList = getSampleAdDataList(numOfAds, "https://ads.example/"); List<AdData> adDataList = getSampleAdDataList(numOfAds, "https://ads.example/");
ImmutableList.Builder<JSScriptArgument> adDataListArgument = new ImmutableList.Builder<>(); ImmutableList.Builder<JSScriptArgument> adDataListArgument = new ImmutableList.Builder<>();
for (AdData adData : adDataList) { for (AdData adData : adDataList) {
adDataListArgument.add(AdDataArgument.asScriptArgument("ignored", adData)); adDataListArgument.add(mAdDataArgumentUtil.asScriptArgument("ignored", adData));
} }
AdSelectionSignals perBuyerSignals = generatePerBuyerSignals(numOfAds); AdSelectionSignals perBuyerSignals = generatePerBuyerSignals(numOfAds);
AdSelectionSignals auctionSignals = AdSelectionSignals.fromString("{\"auctionSignal1" AdSelectionSignals auctionSignals = AdSelectionSignals.fromString("{\"auctionSignal1"
@@ -455,7 +465,7 @@ public class JSScriptEnginePerfTests {
.add(jsonArg("perBuyerSignals", perBuyerSignals)) .add(jsonArg("perBuyerSignals", perBuyerSignals))
.add(jsonArg("trustedBiddingSignals", trustedBiddingSignals)) .add(jsonArg("trustedBiddingSignals", trustedBiddingSignals))
.add(jsonArg("contextualSignals", CONTEXTUAL_SIGNALS)) .add(jsonArg("contextualSignals", CONTEXTUAL_SIGNALS))
.add(CustomAudienceBiddingSignalsArgument.asScriptArgument( .add(CustomAudienceBiddingSignalsArgumentUtil.asScriptArgument(
"customAudienceBiddingSignal", customAudienceSignals)) "customAudienceBiddingSignal", customAudienceSignals))
.build(); .build();
InputStream testJsInputStream = sContext.getAssets().open( InputStream testJsInputStream = sContext.getAssets().open(
@@ -485,7 +495,8 @@ public class JSScriptEnginePerfTests {
ImmutableList.Builder<JSScriptArgument> adWithBidArrayArgument = ImmutableList.Builder<JSScriptArgument> adWithBidArrayArgument =
new ImmutableList.Builder<>(); new ImmutableList.Builder<>();
for (AdWithBid adWithBid : adWithBidList) { for (AdWithBid adWithBid : adWithBidList) {
adWithBidArrayArgument.add(AdWithBidArgument.asScriptArgument("adWithBid", adWithBid)); adWithBidArrayArgument.add(
mAdWithBidArgumentUtil.asScriptArgument("adWithBid", adWithBid));
} }
AdTechIdentifier seller = AdTechIdentifier.fromString("www.example-ssp.com"); AdTechIdentifier seller = AdTechIdentifier.fromString("www.example-ssp.com");
AdSelectionSignals sellerSignals = AdSelectionSignals.fromString("{\"signals\":[]}"); AdSelectionSignals sellerSignals = AdSelectionSignals.fromString("{\"signals\":[]}");
@@ -507,12 +518,12 @@ public class JSScriptEnginePerfTests {
ImmutableList<JSScriptArgument> args = ImmutableList.<JSScriptArgument>builder() ImmutableList<JSScriptArgument> args = ImmutableList.<JSScriptArgument>builder()
.add(arrayArg("adsWithBids", adWithBidArrayArgument.build())) .add(arrayArg("adsWithBids", adWithBidArrayArgument.build()))
.add(AdSelectionConfigArgument.asScriptArgument(adSelectionConfig, .add(AdSelectionConfigArgumentUtil.asScriptArgument(adSelectionConfig,
"adSelectionConfig")) "adSelectionConfig"))
.add(jsonArg("sellerSignals", sellerSignals)) .add(jsonArg("sellerSignals", sellerSignals))
.add(jsonArg("trustedScoringSignals", trustedScoringSignalsJson)) .add(jsonArg("trustedScoringSignals", trustedScoringSignalsJson))
.add(jsonArg("contextualSignals", CONTEXTUAL_SIGNALS)) .add(jsonArg("contextualSignals", CONTEXTUAL_SIGNALS))
.add(CustomAudienceScoringSignalsArgument.asScriptArgument( .add(CustomAudienceScoringSignalsArgumentUtil.asScriptArgument(
"customAudienceScoringSignal", customAudienceSignals)) "customAudienceScoringSignal", customAudienceSignals))
.build(); .build();
InputStream testJsInputStream = sContext.getAssets().open( InputStream testJsInputStream = sContext.getAssets().open(