[sgen] Rename `have_computed_minor_collection_allowance` to `free_swept_blocks`.

[mono.git] / mono / metadata / sgen-new-bridge.c

diff --git a/mono/metadata/sgen-new-bridge.c b/mono/metadata/sgen-new-bridge.c
index 437f61a4d084a343d2c854ee2b4a2a8058fa9829..a8bf84acc02b0f064b446e1a46d2361703901518 100644 (file)
--- a/mono/metadata/sgen-new-bridge.c
+++ b/mono/metadata/sgen-new-bridge.c
@@ -68,6 +68,10 @@
 #define XREFS old_xrefs
 #endif
 
+#define OPTIMIZATION_COPY
+#define OPTIMIZATION_FORWARD
+#define OPTIMIZATION_SINGLETON_DYN_ARRAY
+
 typedef struct {
        int size;
        int capacity;           /* if negative, data points to another DynArray's data */
@@ -262,11 +266,13 @@ dyn_array_int_size (DynIntArray *da)
        return da->array.size;
 }
 
+#ifdef NEW_XREFS
 static void
 dyn_array_int_empty (DynIntArray *da)
 {
        dyn_array_empty (&da->array);
 }
+#endif
 
 static void
 dyn_array_int_add (DynIntArray *da, int x)
@@ -281,17 +287,13 @@ dyn_array_int_get (DynIntArray *da, int x)
        return ((int*)da->array.data)[x];
 }
 
+#ifdef NEW_XREFS
 static void
 dyn_array_int_set (DynIntArray *da, int idx, int val)
 {
        ((int*)da->array.data)[idx] = val;
 }
-
-static void
-dyn_array_int_ensure_capacity (DynIntArray *da, int capacity)
-{
-       dyn_array_ensure_capacity (&da->array, capacity, sizeof (int));
-}
+#endif
 
 static void
 dyn_array_int_ensure_independent (DynIntArray *da)
@@ -322,9 +324,11 @@ dyn_array_ptr_init (DynPtrArray *da)
 static void
 dyn_array_ptr_uninit (DynPtrArray *da)
 {
+#ifdef OPTIMIZATION_SINGLETON_DYN_ARRAY
        if (da->array.capacity == 1)
                dyn_array_ptr_init (da);
        else
+#endif
                dyn_array_uninit (&da->array, sizeof (void*));
 }
 
@@ -337,16 +341,23 @@ dyn_array_ptr_size (DynPtrArray *da)
 static void
 dyn_array_ptr_empty (DynPtrArray *da)
 {
-       dyn_array_empty (&da->array);
+#ifdef OPTIMIZATION_SINGLETON_DYN_ARRAY
+       if (da->array.capacity == 1)
+               dyn_array_ptr_init (da);
+       else
+#endif
+               dyn_array_empty (&da->array);
 }
 
 static void*
 dyn_array_ptr_get (DynPtrArray *da, int x)
 {
+#ifdef OPTIMIZATION_SINGLETON_DYN_ARRAY
        if (da->array.capacity == 1) {
                g_assert (x == 0);
                return da->array.data;
        }
+#endif
        return ((void**)da->array.data)[x];
 }
 
@@ -355,6 +366,7 @@ dyn_array_ptr_add (DynPtrArray *da, void *ptr)
 {
        void **p;
 
+#ifdef OPTIMIZATION_SINGLETON_DYN_ARRAY
        if (da->array.capacity == 0) {
                da->array.capacity = 1;
                da->array.size = 1;
@@ -366,7 +378,9 @@ dyn_array_ptr_add (DynPtrArray *da, void *ptr)
                p0 = dyn_array_add (&da->array, sizeof (void*));
                *p0 = ptr0;
                p = dyn_array_add (&da->array, sizeof (void*));
-       } else {
+       } else
+#endif
+       {
                p = dyn_array_add (&da->array, sizeof (void*));
        }
        *p = ptr;
@@ -380,10 +394,13 @@ dyn_array_ptr_pop (DynPtrArray *da)
        int size = da->array.size;
        void *p;
        g_assert (size > 0);
+#ifdef OPTIMIZATION_SINGLETON_DYN_ARRAY
        if (da->array.capacity == 1) {
                p = dyn_array_ptr_get (da, 0);
                dyn_array_init (&da->array);
-       } else {
+       } else
+#endif
+       {
                g_assert (da->array.capacity > 1);
                dyn_array_ensure_independent (&da->array, sizeof (void*));
                p = dyn_array_ptr_get (da, size - 1);
@@ -428,6 +445,7 @@ dyn_array_scc_get_ptr (DynSCCArray *da, int x)
 
 static DynIntArray merge_array;
 
+#ifdef NEW_XREFS
 static gboolean
 dyn_array_int_contains (DynIntArray *da, int x)
 {
@@ -437,12 +455,14 @@ dyn_array_int_contains (DynIntArray *da, int x)
                        return TRUE;
        return FALSE;
 }
+#endif
 
 static void
 enable_accounting (void)
 {
+       SgenHashTable table = SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_HASH_TABLE, INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY, sizeof (HashEntryWithAccounting), mono_aligned_addr_hash, NULL);
        bridge_accounting_enabled = TRUE;
-       hash_table = (SgenHashTable)SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_HASH_TABLE, INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY, sizeof (HashEntryWithAccounting), mono_aligned_addr_hash, NULL);
+       hash_table = table;
 }
 
 static MonoGCBridgeObjectKind
@@ -508,7 +528,7 @@ add_source (HashEntry *entry, HashEntry *src)
 static void
 free_data (void)
 {
-       MonoObject *obj;
+       MonoObject *obj G_GNUC_UNUSED;
        HashEntry *entry;
        int total_srcs = 0;
        int max_srcs = 0;
@@ -578,12 +598,16 @@ object_needs_expansion (MonoObject **objp)
 static HashEntry*
 follow_forward (HashEntry *entry)
 {
+#ifdef OPTIMIZATION_FORWARD
        while (entry->v.dfs1.forwarded_to) {
                HashEntry *next = entry->v.dfs1.forwarded_to;
                if (next->v.dfs1.forwarded_to)
                        entry->v.dfs1.forwarded_to = next->v.dfs1.forwarded_to;
                entry = next;
        }
+#else
+       g_assert (!entry->v.dfs1.forwarded_to);
+#endif
        return entry;
 }
 
@@ -628,6 +652,7 @@ dfs1 (HashEntry *obj_entry)
                if (obj_entry) {
                        /* obj_entry needs to be expanded */
                        src = dyn_array_ptr_pop (&dfs_stack);
+
                        if (src)
                                g_assert (!src->v.dfs1.forwarded_to);
 
@@ -640,6 +665,7 @@ dfs1 (HashEntry *obj_entry)
 
                        if (!obj_entry->v.dfs1.is_visited) {
                                int num_links = 0;
+                               mword desc = sgen_obj_get_descriptor_safe (start);
 
                                obj_entry->v.dfs1.is_visited = 1;
 
@@ -659,6 +685,7 @@ dfs1 (HashEntry *obj_entry)
                                 * continuing processing this object, we start over with the
                                 * object it points to.
                                 */
+#ifdef OPTIMIZATION_FORWARD
                                if (!obj_entry->is_bridge && num_links == 1) {
                                        HashEntry *dst_entry = dyn_array_ptr_pop (&dfs_stack);
                                        HashEntry *obj_entry_again = dyn_array_ptr_pop (&dfs_stack);
@@ -670,6 +697,7 @@ dfs1 (HashEntry *obj_entry)
                                        }
                                        goto again;
                                }
+#endif
                        }
 
                        if (src) {
@@ -773,8 +801,10 @@ scc_add_xref (SCC *src, SCC *dst)
                        return;
                src->flag = TRUE;
                dyn_array_int_add (&dst->old_xrefs, src->index);
+#ifdef OPTIMIZATION_COPY
        } else if (dyn_array_int_size (&dst->old_xrefs) == 0) {
                dyn_array_int_copy (&dst->old_xrefs, &src->old_xrefs);
+#endif
        } else {
                int i;
                for (i = 0; i < dyn_array_int_size (&src->old_xrefs); ++i) {
@@ -880,8 +910,8 @@ dump_graph (void)
 
        MonoObject *obj;
        HashEntry *entry;
-       int prefix_len = strlen (dump_prefix);
-       char filename [prefix_len + 64];
+       size_t prefix_len = strlen (dump_prefix);
+       char *filename = alloca(prefix_len + 64);
        FILE *file;
        int edge_id = 0;
 
@@ -961,7 +991,7 @@ processing_stw_step (void)
 {
        int i;
        int bridge_count;
-       MonoObject *obj;
+       MonoObject *obj G_GNUC_UNUSED;
        HashEntry *entry;
        SGEN_TV_DECLARE (atv);
        SGEN_TV_DECLARE (btv);
@@ -1017,8 +1047,7 @@ processing_build_callback_data (int generation)
        int i, j;
        int num_sccs, num_xrefs;
        int max_entries, max_xrefs;
-       int sccs_size;
-       MonoObject *obj;
+       MonoObject *obj G_GNUC_UNUSED;
        HashEntry *entry;
        HashEntry **all_entries;
        MonoGCBridgeSCC **api_sccs;
@@ -1179,8 +1208,6 @@ processing_build_callback_data (int generation)
                }
        }
 
-       sccs_size = dyn_array_scc_size (&sccs);
-
        for (i = 0; i < hash_table.num_entries; ++i) {
                HashEntry *entry = all_entries [i];
                second_pass_links += dyn_array_ptr_size (&entry->srcs);