From 5a862295d336479e8a7c7fe2b9c05f1404f0b231 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Tue, 8 Nov 2016 12:00:24 +0100
Subject: [PATCH] [buddy] improve initialization of bddnode

* src/kernel.c, src/kernel.h: Here.
---
 buddy/src/kernel.c | 29 +++++++++++++++--------------
 buddy/src/kernel.h |  9 +++++++++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/buddy/src/kernel.c b/buddy/src/kernel.c
index 0b709c600..49476f11b 100644
--- a/buddy/src/kernel.c
+++ b/buddy/src/kernel.c
@@ -195,16 +195,18 @@ int bdd_init(int initnodesize, int cs)
    /* Load these globals into local variables to help the
       optimizer. */
    int sz = bddnodesize;
-   BddNode* b = bddnodes;
+   BddNodeInit* b = (BddNodeInit*)bddnodes;
    for (n=0 ; n<sz ; n++)
    {
-     b->refcou = 0;
-     b->level = 0;
-     b->low = -1;
-     b->next = n+1;
-     ++b;
+     b[n].z = 0;
+     b[n].low = -1;
+     // Initializing HIGH is useless in BuDDy, but it helps the
+     // compiler vectorizing the code, and it helps the processor
+     // write-combining data to memory.
+     b[n].high = 0;
+     b[n].next = n+1;
    }
-   bddnodes[sz-1].next = 0;
+   b[sz-1].next = 0;
 
    bddnodes[0].refcou = bddnodes[1].refcou = MAXREF;
    LOW(0) = HIGH(0) = 0;
@@ -1447,16 +1449,15 @@ int bdd_noderesize(int doRehash)
    /* copy these global variables into local variables to help the
       optimizer */
    int sz = bddnodesize;
-   BddNode* b = bddnodes + oldsize;
+   BddNodeInit* b = (BddNodeInit*)(bddnodes + oldsize);
    for (n=oldsize ; n<sz ; n++)
    {
-     b->refcou = 0;
-     b->level = 0;
-     b->low = -1;
-     b->next = n+1;
-     ++b;
+     b[n].z = 0;
+     b[n].low = -1;
+     b[n].high = 0;
+     b[n].next = n+1;
    }
-   bddnodes[sz-1].next = bddfreepos;
+   b[sz-1].next = bddfreepos;
    bddfreepos = oldsize;
    bddfreenum += bddnodesize - oldsize;
 
diff --git a/buddy/src/kernel.h b/buddy/src/kernel.h
index 10799c977..ac5372dc9 100644
--- a/buddy/src/kernel.h
+++ b/buddy/src/kernel.h
@@ -99,6 +99,15 @@ typedef struct s_BddNode /* Node table entry */
    int next;
 } BddNode;
 
+// This structure is used during initialization of the above
+// structure, to help gcc vectorize the initializing loop.
+typedef struct s_BddNodeInit
+{
+   int z;
+   int low;
+   int high;
+   int next;
+} BddNodeInit;
 
 /*=== KERNEL VARIABLES =================================================*/