From c6f240e78d72ffae7ae9cdce5aaaeff52fea6535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABlle=20van=20Essen?= Date: Mon, 3 Mar 2025 13:41:19 +0100 Subject: [PATCH] zoc: Refactoring --- zoc/src/main.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/zoc/src/main.rs b/zoc/src/main.rs index 9b7d7eb..6d7b339 100644 --- a/zoc/src/main.rs +++ b/zoc/src/main.rs @@ -52,7 +52,7 @@ fn ptx_to_llvm(ptx: &str) -> Result> { Ok(LLVMArtifacts { bitcode, linked_bitcode, llvm_ir }) } -fn llvm_to_elf(module: &LLVMArtifacts) -> Result, ElfError> { +fn llvm_to_elf(llvm: &LLVMArtifacts) -> Result, ElfError> { use hip_runtime_sys::*; unsafe { hipInit(0) }?; let mut dev_props: MaybeUninit = MaybeUninit::uninit(); @@ -60,11 +60,7 @@ fn llvm_to_elf(module: &LLVMArtifacts) -> Result, ElfError> { let dev_props = unsafe { dev_props.assume_init() }; let gcn_arch = unsafe { CStr::from_ptr(dev_props.gcnArchName.as_ptr()) }; - comgr::compile_bitcode( - gcn_arch, - &module.bitcode, - &module.linked_bitcode, - ).map_err(ElfError::from) + comgr::compile_bitcode(gcn_arch, &llvm.bitcode, &llvm.linked_bitcode).map_err(ElfError::from) } fn write_to_file(content: &[u8], path: &Path) -> io::Result<()> {