Reformat and address minor comments

pytorch · Dec 3, 2023 · 1c03839 · 1c03839
1 parent bb4e9d5
commit 1c03839
Show file tree

Hide file tree

Showing 7 changed files with 338 additions and 364 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -210,7 +210,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
       LIST(APPEND CPUINFO_SRCS
         src/arm/android/properties.c)
     ENDIF()
-  ELSEIF (CPUINFO_TARGET_PROCESSOR MATCHES "^(riscv(32|64)?)$")
+  ELSEIF(CPUINFO_TARGET_PROCESSOR MATCHES "^(riscv(32|64))$")
     LIST(APPEND CPUINFO_SRCS
       src/riscv/cache.c
       src/riscv/uarch.c)
@@ -221,7 +221,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
         src/riscv/linux/init.c
         src/riscv/linux/riscv-hw.c
         src/riscv/linux/riscv-isa.c)
-    ENDIF ()
+    ENDIF()
   ENDIF()
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")

diff --git a/include/cpuinfo.h b/include/cpuinfo.h
@@ -78,14 +78,6 @@
 	#define CPUINFO_ARCH_PPC64 0
 #endif
 
-#ifndef CPUINFO_ARCH_RISCV32
-    #define CPUINFO_ARCH_RISCV32 0
-#endif
-
-#ifndef CPUINFO_ARCH_RISCV64
-    #define CPUINFO_ARCH_RISCV64 0
-#endif
-
 #ifndef CPUINFO_ARCH_ASMJS
 	#define CPUINFO_ARCH_ASMJS 0
 #endif

diff --git a/src/riscv/linux/api.h b/src/riscv/linux/api.h
@@ -7,12 +7,12 @@
 
 #if CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
     /* arch/riscv/include/uapi/asm/hwcap.h */
-	#define CPUINFO_RISCV_LINUX_FEATURE_A                UINT32_C(0x00000001)
-	#define CPUINFO_RISCV_LINUX_FEATURE_C                UINT32_C(0x00000004)
-	#define CPUINFO_RISCV_LINUX_FEATURE_D                UINT32_C(0x00000008)
-	#define CPUINFO_RISCV_LINUX_FEATURE_F                UINT32_C(0x00000020)
 	#define CPUINFO_RISCV_LINUX_FEATURE_I                UINT32_C(0x00000100)
 	#define CPUINFO_RISCV_LINUX_FEATURE_M                UINT32_C(0x00001000)
+	#define CPUINFO_RISCV_LINUX_FEATURE_A                UINT32_C(0x00000001)
+	#define CPUINFO_RISCV_LINUX_FEATURE_F                UINT32_C(0x00000020)
+	#define CPUINFO_RISCV_LINUX_FEATURE_D                UINT32_C(0x00000008)
+	#define CPUINFO_RISCV_LINUX_FEATURE_C                UINT32_C(0x00000004)
 	#define CPUINFO_RISCV_LINUX_FEATURE_V                UINT32_C(0x00200000)
 #endif