simplify by removing _d stages

CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD

Change-Id: I75e232faee6ad48f65bac5b119a461280b27bbc8
Reviewed-on: https://skia-review.googlesource.com/6661
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/bench/SkRasterPipelineBench.cpp b/bench/SkRasterPipelineBench.cpp
index 376efde..6d9bb49 100644
--- a/bench/SkRasterPipelineBench.cpp
+++ b/bench/SkRasterPipelineBench.cpp
@@ -45,13 +45,14 @@
         p.append(SkRasterPipeline::load_8888, &src_ctx);
         p.append_from_srgb(kUnpremul_SkAlphaType);
         p.append(SkRasterPipeline::scale_u8, &mask_ctx);
+        p.append(SkRasterPipeline::move_src_dst);
         if (kF16) {
-            p.append(SkRasterPipeline::load_f16_d, &dst_ctx);
+            p.append(SkRasterPipeline::load_f16, &dst_ctx);
         } else {
-            p.append(SkRasterPipeline::load_8888_d, &dst_ctx);
-            p.append_from_srgb_d(kPremul_SkAlphaType);
+            p.append(SkRasterPipeline::load_8888, &dst_ctx);
+            p.append_from_srgb(kPremul_SkAlphaType);
         }
-        p.append(SkRasterPipeline::srcover);
+        p.append(SkRasterPipeline::dstover);
         if (kF16) {
             p.append(SkRasterPipeline::store_f16, &dst_ctx);
         } else {