[benchmarks][scenic] Use full package URLs.
TEST=garnet-x64-perf-dawson_canyon (CQ)
Change-Id: I264c2b17023ca86b66b06a7784c4d61879bccad7
diff --git a/bin/ui/tests/performance/run_scenic_benchmark.sh b/bin/ui/tests/performance/run_scenic_benchmark.sh
index e96d2f9..d5a9ce7 100644
--- a/bin/ui/tests/performance/run_scenic_benchmark.sh
+++ b/bin/ui/tests/performance/run_scenic_benchmark.sh
@@ -62,7 +62,7 @@
killall root_presenter*; killall scenic*; killall basemgr*; killall view_manager*; killall flutter*; killall set_root_view*
echo "== $BENCHMARK_LABEL: Configuring scenic renderer params..."
-/pkgfs/packages/run/0/bin/run set_renderer_params --render_continuously $RENDERER_PARAMS
+/pkgfs/packages/run/0/bin/run fuchsia-pkg://fuchsia.com/set_renderer_params#meta/set_renderer_params.cmx --render_continuously $RENDERER_PARAMS
echo "== $BENCHMARK_LABEL: Tracing..."
echo $TRACE_FILE
diff --git a/bin/ui/tests/performance/trace_from_host.sh b/bin/ui/tests/performance/trace_from_host.sh
index 25b1dd2..705617d 100755
--- a/bin/ui/tests/performance/trace_from_host.sh
+++ b/bin/ui/tests/performance/trace_from_host.sh
@@ -47,11 +47,11 @@
then
echo "Killing processes and setting renderer params: $@"
(set -x; fx shell "killall root_presenter; killall scenic; killall basemgr; killall view_manager; killall flutter*; killall set_root_view")
- (set -x; fx shell "set_renderer_params --render_continuously $@")
+ (set -x; fx shell "fuchsia-pkg://fuchsia.com/set_renderer_params#meta/set_renderer_params.cmx --render_continuously $@")
echo "== Press control-C to start tracing (after basemgr starts.) =="
(set -x; fx shell "run basemgr &")
else
- (set -x; fx shell "set_renderer_params --render_continuously $@")
+ (set -x; fx shell "fuchsia-pkg://fuchsia.com/set_renderer_params#meta/set_renderer_params.cmx --render_continuously $@")
sleep 2
fi
DATE=`date +%Y-%m-%dT%H:%M:%S`
diff --git a/tests/benchmarks/benchmarks.sh b/tests/benchmarks/benchmarks.sh
index bd82f76..5a40314 100644
--- a/tests/benchmarks/benchmarks.sh
+++ b/tests/benchmarks/benchmarks.sh
@@ -29,7 +29,8 @@
/pkgfs/packages/zircon_benchmarks/0/test/zircon_benchmarks \
-p --out="${OUT_DIR}/zircon_benchmarks.json"
-vulkan_is_supported_result="$(/pkgfs/packages/run/0/bin/run vulkan_is_supported || echo '')"
+vulkan_is_supported="fuchsia-pkg://fuchsia.com/vulkan_is_supported#meta/vulkan_is_supported.cmx"
+vulkan_is_supported_result="$(/pkgfs/packages/run/0/bin/run $vulkan_is_supported || echo '')"
if [ "${vulkan_is_supported_result}" = '1' ]; then
# Run the gfx benchmarks in the current shell environment, because they write
# to (hidden) global state used by runbench_finish.
diff --git a/tests/benchmarks/gfx_benchmarks.sh b/tests/benchmarks/gfx_benchmarks.sh
index 585309d..e1dc947 100644
--- a/tests/benchmarks/gfx_benchmarks.sh
+++ b/tests/benchmarks/gfx_benchmarks.sh
@@ -41,35 +41,42 @@
#
# hello_scenic
#
-bench "fuchsia.scenic.hello_scenic" "hello_scenic" ""
+hello_scenic="fuchsia-pkg://fuchsia.com/hello_scenic#meta/hello_scenic.cmx"
+bench "fuchsia.scenic.hello_scenic" "$hello_scenic" ""
#
# image_grid_cpp
#
+set_root_view="fuchsia-pkg://fuchsia.com/set_root_view#meta/set_root_view.cmx"
+image_grid_cpp="fuchsia-pkg://fuchsia.com/image_grid_cpp#meta/image_grid_cpp.cmx"
+
bench "fuchsia.scenic.image_grid_cpp_noclipping_noshadows" \
- "set_root_view image_grid_cpp" \
+ "$set_root_view $image_grid_cpp" \
"--unshadowed --clipping_disabled"
bench "fuchsia.scenic.image_grid_cpp_noshadows" \
- "set_root_view image_grid_cpp" \
+ "$set_root_view $image_grid_cpp" \
"--unshadowed --clipping_enabled"
bench "fuchsia.scenic.image_grid_cpp_ssdo" \
- "set_root_view image_grid_cpp" \
+ "$set_root_view $image_grid_cpp" \
"--screen_space_shadows --clipping_enabled"
bench "fuchsia.scenic.image_grid_cpp_shadow_map" \
- "set_root_view image_grid_cpp" \
+ "$set_root_view $image_grid_cpp" \
"--shadow_map --clipping_enabled"
bench "fuchsia.scenic.image_grid_cpp_moment_shadow_map" \
- "set_root_view image_grid_cpp" \
+ "$set_root_view $image_grid_cpp" \
"--moment_shadow_map --clipping_enabled"
#
# image_grid_cpp x3
#
-IMAGE_GRID_CPP_X3_COMMAND="set_root_view tile_view image_grid_cpp image_grid_cpp image_grid_cpp"
+
+tile_view="fuchsia-pkg://fuchsia.com/tile_view#meta/tile_view.cmx"
+
+IMAGE_GRID_CPP_X3_COMMAND="$set_root_view $tile_view $image_grid_cpp $image_grid_cpp $image_grid_cpp"
bench "fuchsia.scenic.image_grid_cpp_x3_noclipping_noshadows" \
"${IMAGE_GRID_CPP_X3_COMMAND}" \
"--unshadowed --clipping_disabled"
