Snap for 8564071 from 2d3ab68c4a1db7fa2c9a10d4eb305a948d146404 to mainline-sdkext-release
Change-Id: Ibb1a212cf43dde9d1d7290f3186b363590e7dca2
diff --git a/art/dex2oat_arm_arm64.profdata.2021-07-15 b/art/dex2oat_arm_arm64.profdata.2021-07-15
deleted file mode 100644
index 1476fe1..0000000
--- a/art/dex2oat_arm_arm64.profdata.2021-07-15
+++ /dev/null
Binary files differ
diff --git a/hwbinder/OWNERS b/hwbinder/OWNERS
deleted file mode 100644
index ae43470..0000000
--- a/hwbinder/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Owners of hwbinder PGO profiles
-tkjos@google.com
diff --git a/hwbinder/hwbinder.profdata.2021-07-15 b/hwbinder/hwbinder.profdata.2021-07-15
deleted file mode 100644
index 9495812..0000000
--- a/hwbinder/hwbinder.profdata.2021-07-15
+++ /dev/null
Binary files differ
diff --git a/hwui/OWNERS b/hwui/OWNERS
deleted file mode 100644
index 4fcf2cf..0000000
--- a/hwui/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-# Owners of hwui PGO profiles
-jreck@google.com
-djsollen@google.com
diff --git a/hwui/hwui.profdata.2021-07-15 b/hwui/hwui.profdata.2021-07-15
deleted file mode 100644
index e48ddbe..0000000
--- a/hwui/hwui.profdata.2021-07-15
+++ /dev/null
Binary files differ
diff --git a/art/OWNERS b/pgo/art/OWNERS
similarity index 100%
rename from art/OWNERS
rename to pgo/art/OWNERS
diff --git a/pgo/art/dex2oat_arm_arm64.profdata.2022-04-26 b/pgo/art/dex2oat_arm_arm64.profdata.2022-04-26
new file mode 100644
index 0000000..e0400b3
--- /dev/null
+++ b/pgo/art/dex2oat_arm_arm64.profdata.2022-04-26
Binary files differ
diff --git a/scripts/update_profiles.py b/scripts/update_profiles.py
index 375e96d..7f9807a 100755
--- a/scripts/update_profiles.py
+++ b/scripts/update_profiles.py
@@ -62,22 +62,6 @@
utils.run_llvm_profdata(profraws, output)
-class NativeExeBenchmark(Benchmark):
-
- def apct_test_tag(self):
- return 'apct/perf/pgo/profile-collector'
-
- def profraw_files(self, profile_dir):
- if self.name == 'hwui':
- return [
- 'hwuimacro.profraw', 'hwuimacro_64.profraw',
- 'hwuimicro.profraw', 'hwuimicro_64.profraw',
- 'skia_nanobench.profraw', 'skia_nanobench_64.profraw'
- ]
- elif self.name == 'hwbinder':
- return ['hwbinder.profraw', 'hwbinder_64.profraw']
-
-
class APKBenchmark(Benchmark):
def apct_test_tag(self):
@@ -97,8 +81,6 @@
def BenchmarkFactory(benchmark_name):
if benchmark_name == 'dex2oat':
return APKBenchmark(benchmark_name)
- elif benchmark_name in ['hwui', 'hwbinder']:
- return NativeExeBenchmark(benchmark_name)
else:
raise RuntimeError('Unknown benchmark ' + benchmark_name)
@@ -112,7 +94,7 @@
zip_ref.close()
-KNOWN_BENCHMARKS = ['ALL', 'dex2oat', 'hwui', 'hwbinder']
+KNOWN_BENCHMARKS = ['ALL', 'dex2oat']
def parse_args():
