Merge remote branch 'origin/develop' into piledriver
This commit is contained in:
		
						commit
						d4833f1801
					
				
							
								
								
									
										21
									
								
								common.h
								
								
								
								
							
							
						
						
									
										21
									
								
								common.h
								
								
								
								
							|  | @ -310,13 +310,15 @@ typedef int blasint; | ||||||
| #define YIELDING	SwitchToThread() | #define YIELDING	SwitchToThread() | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| /***************************************************
 | #if defined(ARMV7) || defined(ARMV6) || defined(ARMV8) | ||||||
| Some no-oprations are enough | #define YIELDING        asm volatile ("nop;nop;nop;nop;nop;nop;nop;nop; \n"); | ||||||
| ***************************************************/ |  | ||||||
| #ifdef PILEDRIVER |  | ||||||
| #define YIELDING	__asm__ __volatile__ ("nop;nop;nop;nop;nop;nop;nop;nop;\n"); |  | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
|  | #ifdef PILEDRIVER | ||||||
|  | #define YIELDING        __asm__ __volatile__ ("nop;nop;nop;nop;nop;nop;nop;nop;\n"); | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| #ifndef YIELDING | #ifndef YIELDING | ||||||
| #define YIELDING	sched_yield() | #define YIELDING	sched_yield() | ||||||
| #endif | #endif | ||||||
|  | @ -370,6 +372,15 @@ please https://github.com/xianyi/OpenBLAS/issues/246 | ||||||
| #include "common_mips64.h" | #include "common_mips64.h" | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
|  | #ifdef ARCH_ARM | ||||||
|  | #include "common_arm.h" | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|  | #ifdef ARCH_ARM64 | ||||||
|  | #include "common_arm64.h" | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| #ifdef OS_LINUX | #ifdef OS_LINUX | ||||||
| #include "common_linux.h" | #include "common_linux.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue