Author: Joseph Huber Date: 2022-10-11T17:46:20-05:00 New Revision: adf36ea328910ce019893b426aac044bab166e73
URL: https://github.com/llvm/llvm-project/commit/adf36ea328910ce019893b426aac044bab166e73 DIFF: https://github.com/llvm/llvm-project/commit/adf36ea328910ce019893b426aac044bab166e73.diff LOG: [Clang] Do not build the OffloadActionBuilder when using the new driver The Offloading toolchain currently has two methods for construction the requires actions. The "new" driver and the old `OffloadActionBuilder`. Using either one is mutually exclusive, so we should not initialize this when using the new driver. This was causing some error messages to be printed multiple times because we were checking them in both the old and the new driver. Reviewed By: tra Differential Revision: https://reviews.llvm.org/D135715 Added: Modified: clang/lib/Driver/Driver.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index e612afdd56c9..3300919d7cdd 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -3952,14 +3952,17 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, handleArguments(C, Args, Inputs, Actions); - // Builder to be used to build offloading actions. - OffloadingActionBuilder OffloadBuilder(C, Args, Inputs); - bool UseNewOffloadingDriver = C.isOffloadingHostKind(Action::OFK_OpenMP) || Args.hasFlag(options::OPT_offload_new_driver, options::OPT_no_offload_new_driver, false); + // Builder to be used to build offloading actions. + std::unique_ptr<OffloadingActionBuilder> OffloadBuilder = + !UseNewOffloadingDriver + ? std::make_unique<OffloadingActionBuilder>(C, Args, Inputs) + : nullptr; + // Construct the actions to perform. HeaderModulePrecompileJobAction *HeaderModuleAction = nullptr; ExtractAPIJobAction *ExtractAPIAction = nullptr; @@ -3982,14 +3985,14 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, // Use the current host action in any of the offloading actions, if // required. if (!UseNewOffloadingDriver) - if (OffloadBuilder.addHostDependenceToDeviceActions(Current, InputArg)) + if (OffloadBuilder->addHostDependenceToDeviceActions(Current, InputArg)) break; for (phases::ID Phase : PL) { // Add any offload action the host action depends on. if (!UseNewOffloadingDriver) - Current = OffloadBuilder.addDeviceDependencesToHostAction( + Current = OffloadBuilder->addDeviceDependencesToHostAction( Current, InputArg, Phase, PL.back(), FullPL); if (!Current) break; @@ -4052,7 +4055,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, // Use the current host action in any of the offloading actions, if // required. if (!UseNewOffloadingDriver) - if (OffloadBuilder.addHostDependenceToDeviceActions(Current, InputArg)) + if (OffloadBuilder->addHostDependenceToDeviceActions(Current, InputArg)) break; // Try to build the offloading actions and add the result as a dependency @@ -4070,7 +4073,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, // Add any top level actions generated for offloading. if (!UseNewOffloadingDriver) - OffloadBuilder.appendTopLevelActions(Actions, Current, InputArg); + OffloadBuilder->appendTopLevelActions(Actions, Current, InputArg); else if (Current) Current->propagateHostOffloadInfo(C.getActiveOffloadKinds(), /*BoundArch=*/nullptr); @@ -4082,12 +4085,12 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, Arg *FinalPhaseArg; if (getFinalPhase(Args, &FinalPhaseArg) == phases::Link) if (!UseNewOffloadingDriver) - OffloadBuilder.appendDeviceLinkActions(Actions); + OffloadBuilder->appendDeviceLinkActions(Actions); } if (!LinkerInputs.empty()) { if (!UseNewOffloadingDriver) - if (Action *Wrapper = OffloadBuilder.makeHostLinkAction()) + if (Action *Wrapper = OffloadBuilder->makeHostLinkAction()) LinkerInputs.push_back(Wrapper); Action *LA; // Check if this Linker Job should emit a static library. @@ -4102,7 +4105,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, LA = C.MakeAction<LinkJobAction>(LinkerInputs, types::TY_Image); } if (!UseNewOffloadingDriver) - LA = OffloadBuilder.processHostLinkAction(LA); + LA = OffloadBuilder->processHostLinkAction(LA); Actions.push_back(LA); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
