x86_64を有効化

不要なログ出力を削除テストで変えた評価値のフォルダを元に戻す
ai5 · Aug 18, 2016 · 2eac9fd · 2eac9fd
1 parent b0f27b7
commit 2eac9fd
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -22,11 +22,11 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 endif
 
 ifeq ($(TARGET_ARCH_ABI),x86_64)
-  ARCH_DEF += -DIS_64BIT -DHAVE_SSE42 -DHAVE_SSE4 -msse4.2
+  ARCH_DEF += -DIS_64BIT -DUSE_SSE42 -msse4.2
 endif
 
 
-LOCAL_MODULE    := YaneuraOuh-$(TARGET_ARCH_ABI)
+LOCAL_MODULE    := YaneuraOu-$(TARGET_ARCH_ABI)
 LOCAL_CXXFLAGS  := -std=c++1y -fno-exceptions -fno-rtti -Wextra -Ofast -MMD -MP -fpermissive -D__STDINT_MACROS $(ARCH_DEF)
 LOCAL_CXXFLAGS += -fPIE
 LOCAL_LDFLAGS += -fPIE -pie 

diff --git a/jni/Application.mk b/jni/Application.mk
@@ -1,5 +1,5 @@
 #APP_ABI := x86
-APP_ABI := arm64-v8a
+APP_ABI := x86_64 arm64-v8a
 APP_STL:=c++_static
 LOCAL_ARM_NEON := true
 NDK_TOOLCHAIN_VERSION :=clang3.6
diff --git a/jni/memo.txt b/jni/memo.txt
@@ -9,6 +9,8 @@ Nodes searched  : 51749074
 Nodes/second    : 123360
 
 
+�EWIN NOSSE
+
 �Einfo depth 15 seldepth 29 score cp -2692 nodes 5016969 nps 375324 hashfull 723 time 13367 pv G*1c 4b3b S*2h 9h2h 3i2h+ 2i2h R*4h G*3h 4h4c+ 3b2b 6f2b S*3d 4c3d 3e3d 1c2d B*4e 2d3d 4e3d S*2c 3d2c+ 1b2c
 bestmove G*1c ponder 4b3b
 
@@ -17,4 +19,29 @@ Total time (ms) : 149876
 Nodes searched  : 51749074
 Nodes/second    : 345279
 
+�Eandroid x86_64 nosse
+info depth 15 seldepth 29 score cp -2692 nodes 5016969 nps 396880 hashfull 723 time 12641 pv G*1c 4b3b S*2h 9h2h 3i2h+ 2i2h R*4h G*3h
+bestmove G*1c ponder 4b3b
+
+===========================
+Total time (ms) : 152313
+Nodes searched  : 51749074
+Nodes/second    : 339754
+
+�Eandroid x86_64 SSE42
+info depth 15 seldepth 29 score cp -2692 nodes 5016969 nps 443783 hashfull 723 time 11305 pv G*1c 4b3b S*2h 9h2h
+bestmove G*1c ponder 4b3b
+
+===========================
+Total time (ms) : 143049
+Nodes searched  : 51749074
+Nodes/second    : 361757
 
+�Ewin x86_64 SSE42
+info depth 15 seldepth 29 score cp -2692 nodes 5016969 nps 494039 hashfull 723 time 10155 pv G*1c 4b3b S*2h 9h2h 3i2h+ 2i2h R*4h G*3h 4h4c+ 3b2b 6f2b S*3d 4c3d 3e3d 1c2d B*4e 2d3d 4e3d S*2c 3d2c+ 1b2c
+bestmove G*1c ponder 4b3b
+
+===========================
+Total time (ms) : 125947
+Nodes searched  : 51749074
+Nodes/second    : 410879
diff --git a/source/arm_mm_malloc.h b/source/arm_mm_malloc.h
@@ -9,7 +9,6 @@ static inline void *_mm_malloc(int size, int align)
 {
   void *ret=0;
   posix_memalign(&ret, align, size); // Guessing here
-  std::cout << "mem = " << ret << std::endl;
   return ret;
 }
 

diff --git a/source/usi.cpp b/source/usi.cpp
@@ -264,7 +264,7 @@ namespace USI
     o["EnteringKingRule"] << Option(ekr_rules, ekr_rules[EKR_27_POINT], [](auto& o) { set_entering_king_rule(o); });
 #endif
 
-    o["EvalDir"] << Option("20160307");
+    o["EvalDir"] << Option("eval");
 
 #if defined(EVAL_KPPT) && defined (USE_SHARED_MEMORY_IN_EVAL) && defined(_MSC_VER)
 	// 評価関数パラメーターを共有するか