[ AIE2 ] Driver update for Startup Objects #52
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
clang/lib/Driver/ToolChains/AIE.cpp
Outdated
| @@ -37,6 +37,15 @@ void aie::Linker::ConstructJob(Compilation &C, const JobAction &JA, | |||
| !Args.hasArg(options::OPT_nodefaultlibs)) { | |||
| AddRunTimeLibs(ToolChain, ToolChain.getDriver(), CmdArgs, Args); | |||
| } | |||
| SmallString<128> InstalledDir(ToolChain.getDriver().InstalledDir); | |||
There was a problem hiding this comment.
This requires the startup files to be installed right next to the clang driver, which is not the case.
We should create the following installation dir: test/Driver/Inputs/basic_aie_tree.
In there, create the following structure:
basic_aie_tree/
├── bin
│ └── .keep
└── lib
└── aie2-none-unknown-elf
├── crt0.o
└── crt1.o
The tests can then point -ccc-install-dir to the bin directory.
The clang driver knows how to navigate this installation directory, hence you can simply call
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
options::OPT_r)) {
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt0.o")));
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
}
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| // RUN: %clang %s -### --target=aie2-none-unknown-elf -D__AIE_ENGINE__ -ccc-install-dir /scratch/llvm-aie/clang/test/Driver/Inputs/aie2 2>&1 \ |
There was a problem hiding this comment.
We cannot hardcode this path, this will fail on any other system.
Replace with
-ccc-install-dir %S/Inputs/basic_aie_tree/bin
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| // RUN: %clang %s -### --target=aie2-none-unknown-elf -ccc-install-dir %S/Inputs/basic_aie_tree/bin 2>&1 \ |
There was a problem hiding this comment.
Suggested change
| // RUN: %clang %s -### --target=aie2-none-unknown-elf -ccc-install-dir %S/Inputs/basic_aie_tree/bin 2>&1 \ | |
| // RUN: %clang %s -### --target=aie2-none-unknown-elf -ccc-install-dir %S/../Inputs/basic_aie_tree/bin 2>&1 \ |
SagarMaheshwari99
approved these changes
May 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-ccc-install-dir).