Skip to content

refactor(nvvm): Remove cust_raw as a codegen dependency. #193

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.

Sign up for GitHub

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

Merged
LegNeato merged 1 commit into from
Apr 10, 2025
Merged

refactor(nvvm): Remove cust_raw as a codegen dependency. #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions crates/nvvm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ use std::{

use cust_raw::nvvm_sys;

pub use cust_raw::nvvm_sys::LIBDEVICE_BITCODE;

/// Get the major and minor NVVM IR version.
pub fn ir_version() -> (i32, i32) {
unsafe {
Expand Down
1 change: 0 additions & 1 deletion crates/rustc_codegen_nvvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ readme = "../../README.md"
crate-type = ["dylib"]

[dependencies]
cust_raw = { path = "../cust_raw" }
nvvm = { version = "0.1", path = "../nvvm" }
rustc-demangle = "0.1.24"
libc = "0.2.169"
Expand Down
3 changes: 1 addition & 2 deletions crates/rustc_codegen_nvvm/src/nvvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use crate::common::AsCCharPtr;
use crate::context::CodegenArgs;
use crate::llvm::*;
use crate::lto::ThinBuffer;
use cust_raw::nvvm_sys;
use nvvm::*;
use rustc_codegen_ssa::traits::ThinBufferMethods;
use rustc_session::{Session, config::DebugInfo};
Expand Down Expand Up @@ -105,7 +104,7 @@ pub fn codegen_bitcode_modules(
let buf = ThinBuffer::new(module);

prog.add_module(buf.data(), "merged".to_string())?;
prog.add_lazy_module(nvvm_sys::LIBDEVICE_BITCODE, "libdevice".to_string())?;
prog.add_lazy_module(LIBDEVICE_BITCODE, "libdevice".to_string())?;
prog.add_lazy_module(LIBINTRINSICS, "libintrinsics".to_string())?;

// for now, while the codegen is young, we always run verification on the program.
Expand Down