Recover from and report unknown instructions and directives (#295)

vosen · Nov 2, 2024 · b4cb3ad · b4cb3ad
1 parent 3870a96
commit b4cb3ad
Show file tree

Hide file tree

Showing 5 changed files with 314 additions and 92 deletions.
diff --git a/llvm_zluda/build.rs b/llvm_zluda/build.rs
@@ -16,6 +16,8 @@ fn main() {
     let mut cmake = Config::new(r"../ext/llvm-project/llvm");
     try_use_ninja(&mut cmake);
     cmake
+        // It's not like we can do anything about the warnings
+        .define("LLVM_ENABLE_WARNINGS", "OFF")
         // For some reason Rust always links to release MSVCRT
         .define("CMAKE_MSVC_RUNTIME_LIBRARY", "MultiThreadedDLL")
         .define("LLVM_ENABLE_TERMINFO", "OFF")

diff --git a/llvm_zluda/src/lib.cpp b/llvm_zluda/src/lib.cpp
@@ -1,7 +1,7 @@
 #include <llvm-c/Core.h>
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Type.h"
-#include "llvm/IR/Instructions.h"
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/Type.h>
+#include <llvm/IR/Instructions.h>
 
 using namespace llvm;
 

diff --git a/ptx_parser/src/ast.rs b/ptx_parser/src/ast.rs
@@ -1264,9 +1264,9 @@ pub enum SetpCompareFloat {
 }
 
 impl TryFrom<(RawSetpCompareOp, ScalarKind)> for SetpCompareInt {
-    type Error = PtxError;
+    type Error = PtxError<'static>;
 
-    fn try_from((value, kind): (RawSetpCompareOp, ScalarKind)) -> Result<Self, PtxError> {
+    fn try_from((value, kind): (RawSetpCompareOp, ScalarKind)) -> Result<Self, PtxError<'static>> {
         match (value, kind) {
             (RawSetpCompareOp::Eq, _) => Ok(SetpCompareInt::Eq),
             (RawSetpCompareOp::Ne, _) => Ok(SetpCompareInt::NotEq),