Hello.
Following patch introduces target option support for array types. As discussed
in
[1], the patch is tested on a nios2 target machine.
Ready for trunk?
Thanks,
Martin
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64377
>From 8f32501a6ea3989a44b76fc3ead2f70d1b636b7a Mon Sep 17 00:00:00 2001
From: mliska <mli...@suse.cz>
Date: Fri, 9 Jan 2015 10:31:00 +0100
Subject: [PATCH] Target optimization nodes: add support for arrays.
gcc/ChangeLog:
2015-01-14 Martin Liska <mli...@suse.cz>
PR target/64377
* optc-save-gen.awk: Add support for array types.
---
gcc/optc-save-gen.awk | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk
index ebeb509..04db24c 100644
--- a/gcc/optc-save-gen.awk
+++ b/gcc/optc-save-gen.awk
@@ -437,6 +437,7 @@ print " struct cl_target_option const *ptr2 ATTRIBUTE_UNUSED
print "{";
n_target_val = 0;
n_target_str = 0;
+n_target_array = 0;
for (i = 0; i < n_target_save; i++) {
var = target_save_decl[i];
@@ -448,8 +449,20 @@ for (i = 0; i < n_target_save; i++) {
if (target_save_decl[i] ~ "^const char \\*+[_" alnum "]+$")
var_target_str[n_target_str++] = name;
else {
- var_target_val_type[n_target_val] = type;
- var_target_val[n_target_val++] = name;
+ if (target_save_decl[i] ~ " .*\\[.+\\]+$") {
+ size = name;
+ sub("[^\\[]+\\[", "", size);
+ sub("\\]$", "", size);
+ sub("\\[.+", "", name)
+ sub(" [^ ]+$", "", type)
+ var_target_array[n_target_array] = name
+ var_target_array_type[n_target_array] = type
+ var_target_array_size[n_target_array++] = size
+ }
+ else {
+ var_target_val_type[n_target_val] = type;
+ var_target_val[n_target_val++] = name;
+ }
}
}
if (have_save) {
@@ -484,6 +497,14 @@ for (i = 0; i < n_target_str; i++) {
print " || strcmp (ptr1->" name", ptr2->" name ")))";
print " return false;";
}
+for (i = 0; i < n_target_array; i++) {
+ name = var_target_array[i]
+ size = var_target_array_size[i]
+ type = var_target_array_type[i]
+ print " if (ptr1->" name" != ptr2->" name "";
+ print " || memcmp (ptr1->" name ", ptr2->" name ", " size " * sizeof(" type ")))"
+ print " return false;";
+}
for (i = 0; i < n_target_val; i++) {
name = var_target_val[i]
print " if (ptr1->" name" != ptr2->" name ")";
@@ -507,6 +528,13 @@ for (i = 0; i < n_target_str; i++) {
print " else";
print " hstate.add_int (0);";
}
+for (i = 0; i < n_target_array; i++) {
+ name= var_target_array[i]
+ size = var_target_array_size[i]
+ type = var_target_array_type[i]
+ print " hstate.add_int (" size ");";
+ print " hstate.add (ptr->" name ", sizeof (" type ") * " size ");";
+}
for (i = 0; i < n_target_val; i++) {
name = var_target_val[i]
print " hstate.add_wide_int (ptr->" name");";
@@ -525,6 +553,12 @@ for (i = 0; i < n_target_str; i++) {
name = var_target_str[i]
print " bp_pack_string (ob, bp, ptr->" name", true);";
}
+for (i = 0; i < n_target_array; i++) {
+ name = var_target_array[i]
+ size = var_target_array_size[i]
+ print " for (unsigned i = 0; i < " size "; i++)"
+ print " bp_pack_value (bp, ptr->" name "[i], 64);";
+}
for (i = 0; i < n_target_val; i++) {
name = var_target_val[i]
print " bp_pack_value (bp, ptr->" name", 64);";
@@ -544,6 +578,12 @@ for (i = 0; i < n_target_str; i++) {
print " if (ptr->" name")";
print " ptr->" name" = xstrdup (ptr->" name");";
}
+for (i = 0; i < n_target_array; i++) {
+ name = var_target_array[i]
+ size = var_target_array_size[i]
+ print " for (int i = " size " - 1; i >= 0; i--)"
+ print " ptr->" name "[i] = (" var_target_array_type[i] ") bp_unpack_value (bp, 64);";
+}
for (i = 0; i < n_target_val; i++) {
name = var_target_val[i]
print " ptr->" name" = (" var_target_val_type[i] ") bp_unpack_value (bp, 64);";
--
2.1.2
