Skip to content
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

[mlir] Fix bug that prevents application of PrintingFlags in Location #119373

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

jungmair
Copy link

@jungmair jungmair commented Dec 10, 2024

The current implementation of LocationSnapshotPass takes an OpPrintingFlags argument and stores it as member, but does not use it for printing.
Small fix: use already stored flags for printing (as originally intended)

Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot llvmbot added mlir:core MLIR Core Infrastructure mlir labels Dec 10, 2024
@llvmbot
Copy link
Member

llvmbot commented Dec 10, 2024

@llvm/pr-subscribers-mlir-core

Author: Michael Jungmair (jungmair)

Changes

The current implementation of LocationSnapshotPass takes an OpPrintingFlags argument and stores it as member, but does not use it for printing.
Small fix: use already stored flags for printing (as originally intended)


Full diff: https://github.com/llvm/llvm-project/pull/119373.diff

1 Files Affected:

  • (modified) mlir/lib/Transforms/LocationSnapshot.cpp (+1-1)
diff --git a/mlir/lib/Transforms/LocationSnapshot.cpp b/mlir/lib/Transforms/LocationSnapshot.cpp
index b85850acda91bd..b8f3817db9db6e 100644
--- a/mlir/lib/Transforms/LocationSnapshot.cpp
+++ b/mlir/lib/Transforms/LocationSnapshot.cpp
@@ -140,7 +140,7 @@ struct LocationSnapshotPass
 
   void runOnOperation() override {
     Operation *op = getOperation();
-    if (failed(generateLocationsFromIR(fileName, op, OpPrintingFlags(), tag)))
+    if (failed(generateLocationsFromIR(fileName, op, flags, tag)))
       return signalPassFailure();
   }
 

@llvmbot
Copy link
Member

llvmbot commented Dec 10, 2024

@llvm/pr-subscribers-mlir

Author: Michael Jungmair (jungmair)

Changes

The current implementation of LocationSnapshotPass takes an OpPrintingFlags argument and stores it as member, but does not use it for printing.
Small fix: use already stored flags for printing (as originally intended)


Full diff: https://github.com/llvm/llvm-project/pull/119373.diff

1 Files Affected:

  • (modified) mlir/lib/Transforms/LocationSnapshot.cpp (+1-1)
diff --git a/mlir/lib/Transforms/LocationSnapshot.cpp b/mlir/lib/Transforms/LocationSnapshot.cpp
index b85850acda91bd..b8f3817db9db6e 100644
--- a/mlir/lib/Transforms/LocationSnapshot.cpp
+++ b/mlir/lib/Transforms/LocationSnapshot.cpp
@@ -140,7 +140,7 @@ struct LocationSnapshotPass
 
   void runOnOperation() override {
     Operation *op = getOperation();
-    if (failed(generateLocationsFromIR(fileName, op, OpPrintingFlags(), tag)))
+    if (failed(generateLocationsFromIR(fileName, op, flags, tag)))
       return signalPassFailure();
   }
 

@jungmair
Copy link
Author

@River707 Maybe you could have a look on this?

@joker-eph
Copy link
Collaborator

Thanks for the fix!
Is this something that we can exercise with a test?

@jungmair
Copy link
Author

Thanks for the fix! Is this something that we can exercise with a test?

In theory yes, but IMO it is 1) highly unlikely that there will be a regression 2) requires a bit more effort because the flags are not exposed with mlir-opt and thus would require writing a C++ application that uses it with flags.

@joker-eph
Copy link
Collaborator

OK that's a problem though: the flags should be made a proper pass option, can you moves these to the .td file?

@jungmair
Copy link
Author

I just looked into it, but it is not that easy. As far as I see, there is no previous usage of OpPrintingFlags as pass option/no existing option parser. Also OpPrintingFlags has ~9 settings, so this is not really trivial. What do you propose?

@joker-eph
Copy link
Collaborator

It is a strong concern to me that pass-options must roundtrip.

It does not seem really difficult though, very mechanical, see: joker-eph@ceb4834

More importantly, most of these are irrelevant, so I believe we can prune this down to: joker-eph@94a5496

Does this achieve what you're after?

@jungmair
Copy link
Author

Yes, thanks for your help on this.
I fixed a small typo/bug in your changes and added a test that verifies that the generated snapshot file fits the printing flags (i.e., is printed with debug info)

@@ -1,5 +1,6 @@
// RUN: mlir-opt -allow-unregistered-dialect -snapshot-op-locations='filename=%/t' -mlir-print-local-scope -mlir-print-debuginfo %s | FileCheck %s -DFILE=%/t
// RUN: mlir-opt -allow-unregistered-dialect -snapshot-op-locations='filename=%/t tag='tagged'' -mlir-print-local-scope -mlir-print-debuginfo %s | FileCheck %s --check-prefix=TAG -DFILE=%/t
// RUN: mlir-opt -allow-unregistered-dialect -snapshot-op-locations='filename=%/t print-debuginfo' -mlir-print-local-scope -mlir-print-debuginfo %s | FileCheck %s --check-prefix=DBG -DFILE=%/t && cat %/t | FileCheck %s --check-prefix=DBGFILE
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a nit, but better avoid $$ and split over multiple line: lit will treat it the same.

Suggested change
// RUN: mlir-opt -allow-unregistered-dialect -snapshot-op-locations='filename=%/t print-debuginfo' -mlir-print-local-scope -mlir-print-debuginfo %s | FileCheck %s --check-prefix=DBG -DFILE=%/t && cat %/t | FileCheck %s --check-prefix=DBGFILE
// RUN: mlir-opt -allow-unregistered-dialect -snapshot-op-locations='filename=%/t print-debuginfo' -mlir-print-local-scope -mlir-print-debuginfo %s | FileCheck %s --check-prefix=DBG -DFILE=%/t
// RUN: cat %/t | FileCheck %s --check-prefix=DBGFILE

@jungmair
Copy link
Author

Could you also merge it :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mlir:core MLIR Core Infrastructure mlir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants