MAINT: LoongArch: switch away from the __loongarch64 preprocessor macro

xen0n · xen0n · commit 1652d31fee95 · 2025-01-17T12:29:01.000+08:00
According to the *Toolchain Conventions of the LoongArch Architecture* specification (v1.1) [1], the `__loongarch64` preprocessor macro is in fact a legacy symbol retained for compatibility; the reason being that the GPR width and the calling convention in use are orthogonal to each other, and in reality we care about the calling convention (e.g. ILP32 or LP64) more often than about the hardware capability -- think of ILP32 code on 64-bit hardware, in which case the GPR is wider than what a pointer actually can occupy, for example. As for the two modified places, the header change is actually concerned with the calling convention; and while the implementation change is actually correct regardless of bitness or calling convention, the Loongson maintainer prefers staying with `__loongarch_lp64` to be extra safe against possible API changes for the future ILP32 ABI. [1]: https://github.com/loongson/la-toolchain-conventions/blob/releases/v1.1/LoongArch-toolchain-conventions-EN.adoc
diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h
@@ -109,7 +109,7 @@
     #elif __riscv_xlen == 32
 	#define NPY_CPU_RISCV32
     #endif
-#elif defined(__loongarch64)
+#elif defined(__loongarch_lp64)
     #define NPY_CPU_LOONGARCH64
 #elif defined(__EMSCRIPTEN__)
     /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */
diff --git a/numpy/_core/src/common/npy_cpu_features.c b/numpy/_core/src/common/npy_cpu_features.c
@@ -668,7 +668,7 @@ npy__cpu_init_features(void)
 
 /***************** LoongArch ******************/
 
-#elif defined(__loongarch64)
+#elif defined(__loongarch_lp64)
 
 #include <sys/auxv.h>
 #include <asm/hwcap.h>
@@ -685,7 +685,6 @@ npy__cpu_init_features(void)
    }
 }
 
-
 /***************** ARM ******************/
 
 #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64)

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ npy__cpu_init_features(void)`
`668`	`668`
`669`	`669`	`/*************** LoongArch ****************/`
`670`	`670`
`671`		`-#elif defined(__loongarch64)`
	`671`	`+#elif defined(__loongarch_lp64)`
`672`	`672`
`673`	`673`	`#include <sys/auxv.h>`
`674`	`674`	`#include <asm/hwcap.h>`
`@@ -685,7 +685,6 @@ npy__cpu_init_features(void)`
`685`	`685`	`}`
`686`	`686`	`}`
`687`	`687`
`688`		`-`
`689`	`688`	`/*************** ARM ****************/`
`690`	`689`
`691`	`690`	`#elif defined(__arm__) \|\| defined(__aarch64__) \|\| defined(_M_ARM64)`