git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Patch AArch64 3/3] Fix up for pr70133 

gcc/

	PR target/70133
	* config/aarch64/driver-aarch64.c
	(aarch64_get_extension_string_for_isa_flags): New.
	(arch_extension): Rename to...
	(aarch64_arch_extension): ...This.
	(ext_to_feat_string): Rename to...
	(aarch64_extensions): ...This.
	(aarch64_core_data): Keep track of architecture extension flags.
	(cpu_data): Rename to...
	(aarch64_cpu_data): ...This.
	(aarch64_arch_driver_info): Keep track of architecture extension
	flags.
	(get_arch_name_from_id): Rename to...
	(get_arch_from_id): ...This, change return type.
	(host_detect_local_cpu): Update and reformat for renames, handle
	extensions through common infrastructure.

From-SVN: r234877
This commit is contained in:
James Greenhalgh 2016-04-11 10:16:26 +00:00 committed by James Greenhalgh
parent 04a99ebece
commit 8433cb91f4
2 changed files with 127 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gcc/ChangeLog
View File

@ -1,3 +1,22 @@
2016-04-11 James Greenhalgh <james.greenhalgh@arm.com>
PR target/70133
* config/aarch64/driver-aarch64.c
(aarch64_get_extension_string_for_isa_flags): New.
(arch_extension): Rename to...
(aarch64_arch_extension): ...This.
(ext_to_feat_string): Rename to...
(aarch64_extensions): ...This.
(aarch64_core_data): Keep track of architecture extension flags.
(cpu_data): Rename to...
(aarch64_cpu_data): ...This.
(aarch64_arch_driver_info): Keep track of architecture extension
flags.
(get_arch_name_from_id): Rename to...
(get_arch_from_id): ...This, change return type.
(host_detect_local_cpu): Update and reformat for renames, handle
extensions through common infrastructure.
2016-04-11 James Greenhalgh <james.greenhalgh@arm.com> 2016-04-11 James Greenhalgh <james.greenhalgh@arm.com>
PR target/70133 PR target/70133

111
gcc/config/aarch64/driver-aarch64.c
View File

@ -18,9 +18,16 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include "config.h" #include "config.h"
#define INCLUDE_STRING
#include "system.h" #include "system.h"
#include "coretypes.h"
#include "tm.h"
struct arch_extension /* Defined in common/config/aarch64/aarch64-common.c. */
std::string aarch64_get_extension_string_for_isa_flags (unsigned long,
unsigned long);
struct aarch64_arch_extension
{ {
const char *ext; const char *ext;
unsigned int flag; unsigned int flag;
@ -29,7 +36,7 @@ struct arch_extension
#define AARCH64_OPT_EXTENSION(EXT_NAME, FLAG_CANONICAL, FLAGS_ON, FLAGS_OFF, FEATURE_STRING) \ #define AARCH64_OPT_EXTENSION(EXT_NAME, FLAG_CANONICAL, FLAGS_ON, FLAGS_OFF, FEATURE_STRING) \
{ EXT_NAME, FLAG_CANONICAL, FEATURE_STRING }, { EXT_NAME, FLAG_CANONICAL, FEATURE_STRING },
static struct arch_extension ext_to_feat_string[] = static struct aarch64_arch_extension aarch64_extensions[] =
{ {
#include "aarch64-option-extensions.def" #include "aarch64-option-extensions.def"
}; };
@ -42,15 +49,16 @@ struct aarch64_core_data
const char* arch; const char* arch;
const char* implementer_id; const char* implementer_id;
const char* part_no; const char* part_no;
const unsigned long flags;
}; };
#define AARCH64_CORE(CORE_NAME, CORE_IDENT, SCHED, ARCH, FLAGS, COSTS, IMP, PART) \ #define AARCH64_CORE(CORE_NAME, CORE_IDENT, SCHED, ARCH, FLAGS, COSTS, IMP, PART) \
{ CORE_NAME, #ARCH, IMP, PART }, { CORE_NAME, #ARCH, IMP, PART, FLAGS },
static struct aarch64_core_data cpu_data [] = static struct aarch64_core_data aarch64_cpu_data[] =
{ {
#include "aarch64-cores.def" #include "aarch64-cores.def"
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL, 0 }
}; };
#undef AARCH64_CORE #undef AARCH64_CORE
@ -59,37 +67,37 @@ struct aarch64_arch_driver_info
{ {
const char* id; const char* id;
const char* name; const char* name;
const unsigned long flags;
}; };
#define AARCH64_ARCH(NAME, CORE, ARCH_IDENT, ARCH_REV, FLAGS) \ #define AARCH64_ARCH(NAME, CORE, ARCH_IDENT, ARCH_REV, FLAGS) \
{ #ARCH_IDENT, NAME }, { #ARCH_IDENT, NAME, FLAGS },
static struct aarch64_arch_driver_info aarch64_arches [] = static struct aarch64_arch_driver_info aarch64_arches[] =
{ {
#include "aarch64-arches.def" #include "aarch64-arches.def"
{NULL, NULL} {NULL, NULL, 0}
}; };
#undef AARCH64_ARCH #undef AARCH64_ARCH
/* Return the full architecture name string corresponding to the /* Return an aarch64_arch_driver_info for the architecture described
identifier ID. */ by ID, or NULL if ID describes something we don't know about. */
static const char* static struct aarch64_arch_driver_info*
get_arch_name_from_id (const char* id) get_arch_from_id (const char* id)
{ {
unsigned int i = 0; unsigned int i = 0;
for (i = 0; aarch64_arches[i].id != NULL; i++) for (i = 0; aarch64_arches[i].id != NULL; i++)
{ {
if (strcmp (id, aarch64_arches[i].id) == 0) if (strcmp (id, aarch64_arches[i].id) == 0)
return aarch64_arches[i].name; return &aarch64_arches[i];
} }
return NULL; return NULL;
} }
/* Check wether the string CORE contains the same CPU part numbers /* Check wether the string CORE contains the same CPU part numbers
as BL_STRING. For example CORE="{0xd03, 0xd07}" and BL_STRING="0xd07.0xd03" as BL_STRING. For example CORE="{0xd03, 0xd07}" and BL_STRING="0xd07.0xd03"
should return true. */ should return true. */
@ -142,7 +150,7 @@ host_detect_local_cpu (int argc, const char **argv)
{ {
const char *arch_id = NULL; const char *arch_id = NULL;
const char *res = NULL; const char *res = NULL;
static const int num_exts = ARRAY_SIZE (ext_to_feat_string); static const int num_exts = ARRAY_SIZE (aarch64_extensions);
char buf[128]; char buf[128];
FILE *f = NULL; FILE *f = NULL;
bool arch = false; bool arch = false;
@ -156,6 +164,8 @@ host_detect_local_cpu (int argc, const char **argv)
unsigned int n_imps = 0; unsigned int n_imps = 0;
bool processed_exts = false; bool processed_exts = false;
const char *ext_string = ""; const char *ext_string = "";
unsigned long extension_flags = 0;
unsigned long default_flags = 0;
gcc_assert (argc); gcc_assert (argc);
@ -184,14 +194,15 @@ host_detect_local_cpu (int argc, const char **argv)
{ {
if (strstr (buf, "implementer") != NULL) if (strstr (buf, "implementer") != NULL)
{ {
for (i = 0; cpu_data[i].name != NULL; i++) for (i = 0; aarch64_cpu_data[i].name != NULL; i++)
if (strstr (buf, cpu_data[i].implementer_id) != NULL if (strstr (buf, aarch64_cpu_data[i].implementer_id) != NULL
&& !contains_string_p (imps, cpu_data[i].implementer_id)) && !contains_string_p (imps,
aarch64_cpu_data[i].implementer_id))
{ {
if (n_imps == 2) if (n_imps == 2)
goto not_found; goto not_found;
imps[n_imps++] = cpu_data[i].implementer_id; imps[n_imps++] = aarch64_cpu_data[i].implementer_id;
break; break;
} }
@ -200,16 +211,16 @@ host_detect_local_cpu (int argc, const char **argv)
if (strstr (buf, "part") != NULL) if (strstr (buf, "part") != NULL)
{ {
for (i = 0; cpu_data[i].name != NULL; i++) for (i = 0; aarch64_cpu_data[i].name != NULL; i++)
if (strstr (buf, cpu_data[i].part_no) != NULL if (strstr (buf, aarch64_cpu_data[i].part_no) != NULL
&& !contains_string_p (cores, cpu_data[i].part_no)) && !contains_string_p (cores, aarch64_cpu_data[i].part_no))
{ {
if (n_cores == 2) if (n_cores == 2)
goto not_found; goto not_found;
cores[n_cores++] = cpu_data[i].part_no; cores[n_cores++] = aarch64_cpu_data[i].part_no;
core_idx = i; core_idx = i;
arch_id = cpu_data[i].arch; arch_id = aarch64_cpu_data[i].arch;
break; break;
} }
continue; continue;
@ -218,24 +229,34 @@ host_detect_local_cpu (int argc, const char **argv)
{ {
for (i = 0; i < num_exts; i++) for (i = 0; i < num_exts; i++)
{ {
bool enabled = true;
char *p = NULL; char *p = NULL;
char *feat_string = concat (ext_to_feat_string[i].feat_string, NULL); char *feat_string
= concat (aarch64_extensions[i].feat_string, NULL);
bool enabled = true;
/* This may be a multi-token feature string. We need
to match all parts, which could be in any order.
If this isn't a multi-token feature string, strtok is
just going to return a pointer to feat_string. */
p = strtok (feat_string, " "); p = strtok (feat_string, " ");
while (p != NULL) while (p != NULL)
{ {
if (strstr (buf, p) == NULL) if (strstr (buf, p) == NULL)
{ {
/* Failed to match this token. Turn off the
features we'd otherwise enable. */
enabled = false; enabled = false;
break; break;
} }
p = strtok (NULL, " "); p = strtok (NULL, " ");
} }
ext_string = concat (ext_string, "+", enabled ? "" : "no",
ext_to_feat_string[i].ext, NULL); if (enabled)
extension_flags |= aarch64_extensions[i].flag;
else
extension_flags &= ~(aarch64_extensions[i].flag);
} }
processed_exts = true; processed_exts = true;
} }
} }
@ -252,24 +273,31 @@ host_detect_local_cpu (int argc, const char **argv)
if (arch) if (arch)
{ {
const char* arch_name = get_arch_name_from_id (arch_id); struct aarch64_arch_driver_info* arch_info = get_arch_from_id (arch_id);
/* We got some arch indentifier that's not in aarch64-arches.def? */ /* We got some arch indentifier that's not in aarch64-arches.def? */
if (!arch_name) if (!arch_info)
goto not_found; goto not_found;
res = concat ("-march=", arch_name, NULL); res = concat ("-march=", arch_info->name, NULL);
default_flags = arch_info->flags;
} }
/* We have big.LITTLE. */ /* We have big.LITTLE. */
else if (n_cores == 2) else if (n_cores == 2)
{ {
for (i = 0; cpu_data[i].name != NULL; i++) for (i = 0; aarch64_cpu_data[i].name != NULL; i++)
{ {
if (strchr (cpu_data[i].part_no, '.') != NULL if (strchr (aarch64_cpu_data[i].part_no, '.') != NULL
&& strncmp (cpu_data[i].implementer_id, imps[0], strlen (imps[0]) - 1) == 0 && strncmp (aarch64_cpu_data[i].implementer_id,
&& valid_bL_string_p (cores, cpu_data[i].part_no)) imps[0],
strlen (imps[0]) - 1) == 0
&& valid_bL_string_p (cores, aarch64_cpu_data[i].part_no))
{ {
res = concat ("-m", cpu ? "cpu" : "tune", "=", cpu_data[i].name, NULL); res = concat ("-m",
cpu ? "cpu" : "tune", "=",
aarch64_cpu_data[i].name,
NULL);
default_flags = aarch64_cpu_data[i].flags;
break; break;
} }
} }
@ -279,17 +307,22 @@ host_detect_local_cpu (int argc, const char **argv)
/* The simple, non-big.LITTLE case. */ /* The simple, non-big.LITTLE case. */
else else
{ {
if (strncmp (cpu_data[core_idx].implementer_id, imps[0], if (strncmp (aarch64_cpu_data[core_idx].implementer_id, imps[0],
strlen (imps[0]) - 1) != 0) strlen (imps[0]) - 1) != 0)
goto not_found; goto not_found;
res = concat ("-m", cpu ? "cpu" : "tune", "=", res = concat ("-m", cpu ? "cpu" : "tune", "=",
cpu_data[core_idx].name, NULL); aarch64_cpu_data[core_idx].name, NULL);
default_flags = aarch64_cpu_data[core_idx].flags;
} }
if (tune) if (tune)
return res; return res;
ext_string
= aarch64_get_extension_string_for_isa_flags (extension_flags,
default_flags).c_str ();
res = concat (res, ext_string, NULL); res = concat (res, ext_string, NULL);
return res; return res;