From ab69443bd4b5108bcc34ff5dc3ded479206e6ed4 Mon Sep 17 00:00:00 2001
From: Zhang Xianyi <traits.zhang@gmail.com>
Date: Sun, 5 Jan 2014 23:44:29 +0800
Subject: [PATCH] Refs #332. Added addtional Intel Ivy Bridge and Haswell
 CPU-id.

---
 cpuid_x86.c             | 7 +++++++
 driver/others/dynamic.c | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cpuid_x86.c b/cpuid_x86.c
index 4ed01b891..a991efbc2 100644
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@@ -1051,11 +1051,14 @@ int get_cpuname(void){
       case 3:
 	switch (model) {
 	case 10:
+        case 14:
+	  // Ivy Bridge
 	  if(support_avx())
 	    return CPUTYPE_SANDYBRIDGE;
 	  else
 	    return CPUTYPE_NEHALEM;
         case 12:
+	case 15:
           if(support_avx())
             return CPUTYPE_HASWELL;
           else
@@ -1065,6 +1068,7 @@ int get_cpuname(void){
       case 4:
         switch (model) {
         case 5:
+	case 6:
           if(support_avx())
             return CPUTYPE_HASWELL;
           else
@@ -1457,11 +1461,13 @@ int get_coretype(void){
       case 3:
 	switch (model) {
 	case 10:
+	case 14:
 	  if(support_avx())
 	    return CORE_SANDYBRIDGE;
 	  else
 	    return CORE_NEHALEM; //OS doesn't support AVX
         case 12:
+	case 15:
           if(support_avx())
             return CORE_HASWELL;
           else
@@ -1471,6 +1477,7 @@ int get_coretype(void){
       case 4:
         switch (model) {
         case 5:
+	case 6:
           if(support_avx())
             return CORE_HASWELL;
           else
diff --git a/driver/others/dynamic.c b/driver/others/dynamic.c
index d6a08eb9f..52b984f09 100644
--- a/driver/others/dynamic.c
+++ b/driver/others/dynamic.c
@@ -186,7 +186,7 @@ static gotoblas_t *get_coretype(void){
 	return NULL;
       case 3:
 	//Intel Sandy Bridge 22nm (Ivy Bridge?)
-	if (model == 10) {
+	if (model == 10 || model == 14) {
 	  if(support_avx())
 	    return &gotoblas_SANDYBRIDGE;
 	  else{
@@ -195,7 +195,7 @@ static gotoblas_t *get_coretype(void){
 	  }
 	}
 	//Intel Haswell
-	if (model == 12) {
+	if (model == 12 || model == 15) {
 	  if(support_avx())
 	    return &gotoblas_HASWELL;
 	  else{
@@ -206,7 +206,7 @@ static gotoblas_t *get_coretype(void){
 	return NULL;
       case 4:
 		//Intel Haswell
-	if (model == 5) {
+	if (model == 5 || model == 6) {
 	  if(support_avx())
 	    return &gotoblas_HASWELL;
 	  else{