Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

re: gallium llvmpipe failure & NDEBUG on netbsd-11 [PATCH]



> After reading through code a little more, I found a fix, which returns
> back to netbsd-10 behaviour for llvmpipe. My machine has an AMD Ryzen 7900
> which is Zen4 based... but our LLVM lacks the newer Zen4 description.
> Maybe that's why?
>
> diff --git a/external/apache2/llvm/dist/llvm/lib/Target/X86/X86ScheduleZnver3.td b/external/apache2/llvm/dist/llvm/lib/Target/X86/X86ScheduleZnver3.td
> index fae9b1b51ef1..1229f68760a5 100644
> --- a/external/apache2/llvm/dist/llvm/lib/Target/X86/X86ScheduleZnver3.td
> +++ b/external/apache2/llvm/dist/llvm/lib/Target/X86/X86ScheduleZnver3.td
> @@ -60,7 +60,7 @@ def Znver3Model : SchedMachineModel {
>  
>    let PostRAScheduler = 1; // Enable Post RegAlloc Scheduler pass.
>  
> -  let CompleteModel = 1;
> +  let CompleteModel = 0;
>  }
>  
>  let SchedModel = Znver3Model in {

this reminded me i have a hack on my zen4 desktop (using nouveau),
(though i'm only at that computer sometimes.)  see below.

can you file a PR?


Index: external/apache2/llvm/Makefile.inc
===================================================================
RCS file: /cvsroot/src/external/apache2/llvm/Makefile.inc,v
retrieving revision 1.8
diff -p -u -u -r1.8 Makefile.inc
--- external/apache2/llvm/Makefile.inc	4 Jun 2023 17:48:05 -0000	1.8
+++ external/apache2/llvm/Makefile.inc	7 May 2026 03:43:59 -0000
@@ -58,6 +58,7 @@ LDADD+=		-lexecinfo
 .endif
 CPPFLAGS+=	-I${LLVM_INCLUDE_OBJDIR} -I${LLVM_INCLUDE_CONFIG} \
 		-I${CLANG_INCLUDE_CONFIG}
+CPPFLAGS+=	-DNDEBUG
 
 LLVM_PLATFORM=${MACHINE_GNU_ARCH}--netbsd
 
Index: external/apache2/llvm/dist/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
===================================================================
RCS file: /cvsroot/src/external/apache2/llvm/dist/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp,v
retrieving revision 1.1.1.1
diff -p -u -u -r1.1.1.1 OMPIRBuilder.cpp
--- external/apache2/llvm/dist/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp	30 May 2021 01:27:45 -0000	1.1.1.1
+++ external/apache2/llvm/dist/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp	7 May 2026 03:43:59 -0000
@@ -2371,9 +2371,9 @@ OpenMPIRBuilder::createAtomicWrite(const
         X.Var, IntCastTy->getPointerTo(Addrspace), "atomic.dst.int.cast");
     Value *ExprCast =
         Builder.CreateBitCast(Expr, IntCastTy, "atomic.src.int.cast");
-    Builder.GetInsertBlock()->getParent()->dump();
+    //Builder.GetInsertBlock()->getParent()->dump();
     StoreInst *XSt = Builder.CreateStore(ExprCast, XBCast, X.IsVolatile);
-    Builder.GetInsertBlock()->dump();
+    //Builder.GetInsertBlock()->dump();
     XSt->setAtomic(AO);
   }
 


Home | Main Index | Thread Index | Old Index