New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[LLVMify F18] Compiler module folders should have capitalised names #980
[LLVMify F18] Compiler module folders should have capitalised names #980
Conversation
Question: should the namespaces also need to be changed? |
This branch needs to rebase with origin/master to remove the conflicts. |
f057858
to
5fa3ed8
Compare
Ok, after talking with @DavidTruby I think it was safe to do a git pull --rebase and a git push force. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change here too.
test/Evaluate/CMakeLists.txt:#===-- test/evaluate/CMakeLists.txt ----------------------------------------===#
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Used the patented 'eye tool' on this one and only spotted a couple of things.
I don't think splitting this into two in the way that you have done is right because I think the first commit won't build without the second one. I get wanting to split this up but that shouldn't be at the expense of making each commit leave the repo in a buildable state. We should squash the commits before we merge the PR.
On the clang-format change Peter pointed out a way that we can hide commits like this from git history. So we can use that on this commit too.
There is some problem with the merge. |
@RichBarton-Arm I had this conversation with @peterwaller-arm before deciding what to do. Peters answer: |
The reason for splitting this up isn't that we want to, but git just simply doesn't understand that a move has happened if you do both in one commit, and there doesn't seem to be a way to make it understand that other than splitting the commits. So we have a choice between a rogue commit that doesn't build or a broken history because git sees this as every file in the repo being deleted and new files being added. I personally think the latter is worse behaviour than the former! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok - happy with the justification on the split commits. It sounds like the plan is to squash before merge anyway.
[**Out-of-topic]**I noticed that there is no header text inside all .cpp and .h files inside f18/test. |
I think that follows the pattern in other LLVM projects too. Sometimes the tests are very small files, so they would mostly be header. Don't think that needs to be part of this patch anyhow. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the last two changes and responses to my other comments, I am happy with the patch.
@sscalpone we think this is ready to land. We need to squash before merging. Does anyone else want to review this before we squash? |
@CarolineConcatto @RichBarton-Arm Looks good. Please resolve conflicts & squash. |
ee7cada
to
77e82fa
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The commit message is 120 lines long. Can you edit it down to something reasonable?
c5af1c7
to
500f81a
Compare
@DavidTruby There are still conflict to resolve. |
500f81a
to
a90d825
Compare
bc32ead
to
7ea66e1
Compare
#include "llvm/Support/raw_ostream.h" | ||
#include "flang/Common/Fortran-features.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should the llvm file above come at the end of the listing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it should. For some reason git thought it would be nice to put at the beginning, once all this patch does is sed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
This patch renames the modules in f18 to use a capital letter in the module name Signed-off-by: Caroline Concatto <caroline.concatto@arm.com>
dc5ef34
to
4fa2906
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
… names (flang-compiler/f18#980) This patch renames the modules in f18 to use a capital letter in the module name Signed-off-by: Caroline Concatto <caroline.concatto@arm.com> Original-commit: flang-compiler/f18@d2eb7a1 Reviewed-on: flang-compiler/f18#980
… names (flang-compiler/f18#980) This patch renames the modules in f18 to use a capital letter in the module name Signed-off-by: Caroline Concatto <caroline.concatto@arm.com> Original-commit: flang-compiler/f18@d2eb7a1 Reviewed-on: flang-compiler/f18#980
This patch renames the modules in f18 to use a capital letter in the
module name[1]
Firstly we create new folders with the capitalised name of the modules
and then we do git mv for these new folders. Besides that, many files were
modified to point and include the names of these modules.
The task is very easy, the only problem is that it will mess with git
history thinking that new files were created, and lots of them were deleted.
So to reduce to chaos, this task will be split into two commits.
The first one creates and moves the files inside f18. The second commit
will update the includes in the files that need to be updated.
This first commit renames the folder inside:
->include/flang/[common | decimal | evaluate | parser | semantics]
->lib/[common | decimal | evaluate | parser | semantics]
->test/[decimal | evaluate | preprocessing | runtime | semantics]
->test-lit/driver
to capitalise names
This is achieved by doing git mv for each module, as shown below:
$for i in lib/common/*; do git mv $i lib/Common; done
[1]#963
Signed-off-by: Caroline Concatto caroline.concatto@arm.com