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

Workaround for expansion of function-like macros #2779

Merged
merged 1 commit into from Apr 1, 2024

Conversation

jbaublitz
Copy link
Contributor

Related to #753

@ojeda Let me know if you have any thoughts on this. Compared to without the fallback (1s on the contants in the kernel header) I managed to get the compilation times from 2m to 8s to 3.5s. There may be additional optimizations we can do but it seems like it's definitely trending in the right direction.

@ojeda ojeda added the rust-for-linux Issues relevant to the Rust for Linux project label Mar 11, 2024
@jbaublitz jbaublitz force-pushed the issue-rust-bindgen-753 branch 2 times, most recently from 104a714 to 3990e2f Compare March 11, 2024 16:53
Copy link

@ojeda ojeda left a comment

Choose a reason for hiding this comment

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

3.5s sounds quite usable! Thanks John!

Some comments below...

bindgen/ir/context.rs Outdated Show resolved Hide resolved
bindgen/clang.rs Outdated Show resolved Hide resolved
bindgen/options/mod.rs Outdated Show resolved Hide resolved
bindgen/clang.rs Outdated Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/clang.rs Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@emilio emilio left a comment

Choose a reason for hiding this comment

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

This looks neat. I'm a bit concerned about just using a constant file name in the cwd for this, but that's not unfixable (we could even use a proper temporary file from the tempfile crate or something). No need to fix it right now.

.open(&file)
.ok()?
.write_all(contents.as_bytes())
.ok()?;
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder, do we really need to write this file to disk? Can we somehow abuse the CXUnsavedFile API to do this in memory in both code paths?

Otherwise, should we delete it?

Also, it's a bit unfortunate that if the user happens to have a valuable thing there (unlikely) we'd throw it away.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please take a look at my most recent addition of --clang-macro-fallback-build-dir. That might address your concern.

bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/ir/var.rs Outdated Show resolved Hide resolved
bindgen/ir/context.rs Outdated Show resolved Hide resolved
bindgen/clang.rs Show resolved Hide resolved
@jbaublitz
Copy link
Contributor Author

I've done a quick pass to fix the low hanging fruit. Will try to get back to this later today to resolve the rest of the concerns and follow up on any outstanding discussions.

@jbaublitz jbaublitz force-pushed the issue-rust-bindgen-753 branch 3 times, most recently from 3a52ac5 to 6911401 Compare March 14, 2024 15:46
@jbaublitz jbaublitz changed the title Workaround for expansion of funcion-like macros Workaround for expansion of function-like macros Mar 14, 2024
@jbaublitz jbaublitz force-pushed the issue-rust-bindgen-753 branch 4 times, most recently from 10036f1 to 390062a Compare March 14, 2024 18:00
@jbaublitz
Copy link
Contributor Author

@ojeda @emilio I think this is ready for a second pass! I think I've addressed all of the concerns raised above.

Copy link
Contributor

@emilio emilio left a comment

Choose a reason for hiding this comment

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

Looks good with that simplification, but can we add a test for this? Let me know if you need any help with it.

return None;
}

let file = format!(
Copy link
Contributor

Choose a reason for hiding this comment

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

The translation unit has the file path already, so this could be moved to try_ensure_fallback_translation_unit, and just use ftu.file_path below, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This depends a little bit on how you want to see this implemented. On one hand, we could make the member of FallbackTranslationUnit crate public, but I think we'd require a clone because otherwise when we pass it in, we'd have a mutable reference taken for .reparse() and an immutable reference taken for &ftu.file_path. We could also change the API slightly so that .reparse() only takes file contents as it's only operating on a single file and we may not need the flexibility of supporting reparsing multiple different files. I'd personally prefer the second approach.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've made the changes to reflect the second option. Let me know what you think.

@jbaublitz
Copy link
Contributor Author

@emilio What would you like in terms of the test? An integration or unit test or both?

@jbaublitz jbaublitz force-pushed the issue-rust-bindgen-753 branch 2 times, most recently from 0e553e3 to b5df566 Compare March 19, 2024 18:32
@emilio
Copy link
Contributor

emilio commented Mar 19, 2024

@emilio What would you like in terms of the test? An integration or unit test or both?

Integration should be fine. Just using the new flags from a regular test (see the tests/headers directory and bindgen-flags: directives). I think it should be straight-forward but let me know if you hit any issues or weirdness. Thanks!

bindgen/ir/context.rs Outdated Show resolved Hide resolved
@jbaublitz jbaublitz force-pushed the issue-rust-bindgen-753 branch 3 times, most recently from b71bb6f to 4f319fa Compare March 19, 2024 23:59
@jbaublitz
Copy link
Contributor Author

Okay I think I've addressed everything!

@emilio
Copy link
Contributor

emilio commented Mar 20, 2024

It seems clang 9.0 doesn't like your test and the new test fails there. Let me know if you have the appetite to chase that down (shouldn't be hard by pulling a pre-built clang for Linux amd64, and pointing to it with LIBCLANG_PATH).

Otherwise I guess we can document the option as best effort / not working on older libclang versions (totally fine), and silence the failure there by adding the empty (well with the #[allow(...)]) expectation file to bindgen-tests/tests/expectations/tests/libclang-9/.

@jbaublitz
Copy link
Contributor Author

I may need a little bit of help in terms of the explanation but I can reproduce this reusing a precompiled header from 9.x on the latest version and vice versa. I'm wondering if there's a way there's a lingering precompiled header in the test suite somehow. This also raises the question of whether we should also be deleting the precompiled headers because debugging this would be incredibly difficult for users unfamiliar with the code and I expect you'll bump into in increase in issues with this feature if we don't.

@jbaublitz
Copy link
Contributor Author

Okay, I managed to track it down to Clang_Cursor_Evaluate. In Clang 9, this returns a NULL pointer when trying to evaluate a Cursor over Cursors with kinds IntegerLiteral and BinaryOperator. I'm not sure if this is a bug or not, but I think it may be best to ignore for the time being. I'll add the file you recommended.

@jbaublitz jbaublitz force-pushed the issue-rust-bindgen-753 branch 2 times, most recently from 6c0044f to 9ded89d Compare March 20, 2024 23:28
Copy link
Contributor

@emilio emilio left a comment

Choose a reason for hiding this comment

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

This might need a rebase (might be able to do that automatically, we'll see), but looks good to me, thanks!

@emilio emilio enabled auto-merge (rebase) April 1, 2024 20:00
This commit resolves an issue where macros that evaluate to a constant
but have a function like macro in the macro body would not be properly
expanded by cexpr.

This adds an opt-in option to use Clang on intermediary files to
evaluate the macros one by one. This is opt-in largely because of the
compile time implications.
auto-merge was automatically disabled April 1, 2024 20:21

Merge queue setting changed

@emilio emilio added this pull request to the merge queue Apr 1, 2024
Merged via the queue into rust-lang:main with commit 6e42ccf Apr 1, 2024
33 checks passed
@SeleDreams
Copy link

SeleDreams commented Apr 27, 2024

@jbaublitz I was able to test this workaround, but it doesn't seem to be working in my case.
I am trying to make a wrapper around the blocksds libnds library (meant for making DS homebrews)

this is a part of the macros that register the interrupts

#include <nds/ndstypes.h>

// Values allowed for REG_IE and REG_IF
#define IRQ_VBLANK          BIT(0)  ///< Vertical blank interrupt mask
#define IRQ_HBLANK          BIT(1)  ///< Horizontal blank interrupt mask
#define IRQ_VCOUNT          BIT(2)  ///< Vcount match interrupt mask
#define IRQ_TIMER0          BIT(3)  ///< Timer 0 interrupt mask
#define IRQ_TIMER1          BIT(4)  ///< Timer 1 interrupt mask
#define IRQ_TIMER2          BIT(5)  ///< Timer 2 interrupt mask
#define IRQ_TIMER3          BIT(6)  ///< Timer 3 interrupt mask
#ifdef ARM7
#define IRQ_NETWORK         BIT(7)  ///< Serial/RTC interrupt mask (ARM7) (deprecated name)
#define IRQ_RTC             BIT(7)  ///< Serial/RTC interrupt mask (ARM7)
#endif
#define IRQ_DMA0            BIT(8)  ///< DMA 0 interrupt mask
#define IRQ_DMA1            BIT(9)  ///< DMA 1 interrupt mask
#define IRQ_DMA2            BIT(10) ///< DMA 2 interrupt mask
#define IRQ_DMA3            BIT(11) ///< DMA 3 interrupt mask
#define IRQ_KEYS            BIT(12) ///< Keypad interrupt mask
#define IRQ_CART            BIT(13) ///< GBA cartridge interrupt mask
#define IRQ_IPC_SYNC        BIT(16) ///< IPC sync interrupt mask

and BIT is a macro defined in ndstypes

/// Returns a number with the nth bit set.
#define BIT(n) (1 << (n))

none of the IRQ defines end up set in the wrapper

let bindings = bindgen::Builder::default()
        // The input header we would like to generate
        // bindings for.
        .header("wrapper.h")
        .wrap_static_fns(true)
        .wrap_static_fns_path("src/arm7_bindings.c")
        .use_core()
        .trust_clang_mangling(false)
        .layout_tests(false)
        .ctypes_prefix("::libc")
        .prepend_enum_name(false)
        .blocklist_type("__builtin_va_list")
        .blocklist_type("__va_list")
        .derive_default(true)
        // Tell cargo to invalidate the built crate whenever any of the
        // included header files changed.
        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
        .clang_arg(format!("-I{}/libs/libnds/include",blocksds_path))
        .clang_arg(format!("-I{}/libs/dswifi/include",blocksds_path))
        .clang_arg(format!("-I{}/libs/maxmod/include",blocksds_path))
        .clang_arg(format!("-isystem{}/toolchain/gcc-arm-none-eabi/arm-none-eabi/include",wonderful_path))
        .clang_arg("-DARM7")
        .clang_macro_fallback()
        // Finish the builder and generate the bindings.
        .generate()
        // Unwrap the Result and panic on failure.
        .expect("Unable to generate bindings");

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rust-for-linux Issues relevant to the Rust for Linux project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants