Fix use_static_deps

[dbort]

Summary:
The patching logic wasn't actually modifying deps to use the _static targets when a top-level target specified use_static_deps.

E.g.,

buck2 cquery "fbsource//xplat/executorch/extension/module:module_static" --output-attribute buck.deps | grep /executorch

showed that this target depended on non-static deps

  "fbsource//xplat/executorch/extension/module:module_static (cfg:linux-x86_64-fbcode-platform010-asan-ubsan-dev#2092a9d2d16c9cde)": {
      "fbsource//xplat/executorch/extension/memory_allocator:malloc_memory_allocator (cfg:linux-x86_64-fbcode-platform010-asan-ubsan-dev#2092a9d2d16c9cde)",
      "fbsource//xplat/executorch/extension/data_loader:mmap_data_loader (cfg:linux-x86_64-fbcode-platform010-asan-ubsan-dev#2092a9d2d16c9cde)",
      "fbsource//xplat/executorch/runtime/executor:program (cfg:linux-x86_64-fbcode-platform010-asan-ubsan-dev#2092a9d2d16c9cde)",

instead of depending on the _static versions of those targets.

This happened because _patch_executorch_references() was calling env.patch_target_for_env(target) (which can add a prefix like //xplat) prefix before calling env.target_needs_patch(target) (which checks the prefix of the targets).

So, now we do the patch_target_for_env() after all other calls to target_needs_patch().

Reviewed By: larryliu0820, kirklandsign

Differential Revision: D53374745

[pytorch-bot]

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/1834

• 📄 Preview Python docs built from this PR

Note: Links to docs will display an error until the docs builds have been completed.

✅ You can merge normally! (7 Unrelated Failures)

As of commit 21fec32 with merge base ad67a3d ():

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

• pull / test-models-linux (buck2, mv3, xnnpack-quantization-delegation, linux.2xlarge, 90) / linux-job (gh)
  Delegation fp32 error
• pull / test-models-linux (cmake, add, xnnpack-quantization-delegation, linux.2xlarge, 90) / linux-job (gh)
  Delegation fp32 error
• pull / test-models-linux (cmake, ic3, xnnpack-quantization-delegation, linux.2xlarge, 90) / linux-job (gh)
  Delegation fp32 error
• pull / test-models-linux (cmake, mv2, xnnpack-quantization-delegation, linux.2xlarge, 90) / linux-job (gh)
  Delegation fp32 error
• pull / test-models-linux (cmake, mv3, xnnpack-quantization-delegation, linux.2xlarge, 90) / linux-job (gh)
  Delegation fp32 error
• pull / test-models-linux (cmake, resnet18, xnnpack-quantization-delegation, linux.2xlarge, 90) / linux-job (gh)
  Delegation fp32 error
• pull / test-models-linux (cmake, vit, xnnpack-delegation, linux.2xlarge, 90) / linux-job (gh)
  Delegation fp32 error

This comment was automatically generated by Dr. CI and updates every 15 minutes.

[facebook-github-bot]

This pull request was exported from Phabricator. Differential Revision: D53374745