aaa

philiprbrenan · Feb 5, 2025 · dcd42f0 · dcd42f0
1 parent e0f3e17
commit dcd42f0
Show file tree

Hide file tree

Showing 96 changed files with 254,085 additions and 250,401 deletions.
diff --git a/BtreePA.java b/BtreePA.java
@@ -1032,14 +1032,24 @@ P.new If (T.at(leafIsFull))
 
     lT.split(lL, lR);                                                           // Split root leaf into child leaves
 
-    lR.firstElement();
-    lL. lastElement();
-    T.setIntInstruction(node_setBranch,  root); setBranch();                    // The root is now a branch
-    T.setIntInstruction(node_branchBase, root); branchBase();                   // Set address of the referenced leaf stuck
-    bT.base(T.at(branchBase));                                                  // Set address of the referenced leaf stuck
-    bT.clear();                                                                 // Clear the branch
-    T.at(firstKey).move(lR.T.at(lR.tKey));                                      // First of right leaf
-    T.at(lastKey ).move(lL.T.at(lL.tKey));                                      // Last of left leaf
+    P.parallelStart();
+      lR.firstElement();
+    P.parallelSection();
+      lL. lastElement();
+    P.parallelSection();
+      T.setIntInstruction(node_setBranch,  root); setBranch();                  // The root is now a branch
+    P.parallelSection();
+      T.setIntInstruction(node_branchBase, root); branchBase();                 // Set address of the referenced leaf stuck
+      bT.base(T.at(branchBase));                                                // Set address of the referenced leaf stuck
+      bT.clear();                                                               // Clear the branch
+    P.parallelEnd();
+
+    P.parallelStart();
+      T.at(firstKey).move(lR.T.at(lR.tKey));                                    // First of right leaf
+    P.parallelSection();
+      T.at(lastKey ).move(lL.T.at(lL.tKey));                                    // Last of left leaf
+    P.parallelEnd();
+
     P.new I()                                                                   // Mid key - keys are likely to be bigger than 31 bits
      {void a()
        {T.at(flKey).setInt((T.at(firstKey).getInt()+T.at(lastKey).getInt())/2);
@@ -1055,8 +1065,12 @@ String v()
      (bT.T.at(bT.tKey ), T.at(flKey),                                           /// Parallel possible
       bT.T.at(bT.tData), T.at(l));
     bT.push();                                                                  // Insert left leaf into root
-    bT.T.at(bT.tKey).zero();
-    bT.T.at(bT.tData).move(T.at(r));
+
+    P.parallelStart();
+      bT.T.at(bT.tKey).zero();
+    P.parallelSection();
+      bT.T.at(bT.tData).move(T.at(r));
+    P.parallelEnd();
     bT.push();                                                                  // Insert right into root. This will be the top node and so ignored by search ... except last.
    }
 
@@ -3589,7 +3603,7 @@ static void test_verilog_put()                                                //
 1,2=0 |
 """);
                                                                                 // Split instruction
-    t.runVerilogPutTest(3, 264, """
+    t.runVerilogPutTest(3, 245, """
     1      |
     0      |
     1      |

diff --git a/verilog/delete/1/delete b/verilog/delete/1/delete
diff --git a/verilog/delete/1/delete.v b/verilog/delete/1/delete.v
diff --git a/verilog/delete/1/includes/M.vh b/verilog/delete/1/includes/M.vh
@@ -1,4 +1,4 @@
-reg [282:0] M_9;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2491:<init>   BtreePA.java:3456:<init>   BtreePA.java:3455:runVerilogDeleteTest   BtreePA.java:3528:test_verilog_delete   BtreePA.java:3677:newTests   BtreePA.java:3686:main  */
+reg [282:0] M_9;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2505:<init>   BtreePA.java:3470:<init>   BtreePA.java:3469:runVerilogDeleteTest   BtreePA.java:3542:test_verilog_delete   BtreePA.java:3691:newTests   BtreePA.java:3700:main  */
 task initialize_memory_M_9;
     begin
         M_9[0] <= 0;

diff --git a/verilog/delete/1/includes/T.vh b/verilog/delete/1/includes/T.vh
@@ -1,4 +1,4 @@
-reg [239:0] T_10;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2492:<init>   BtreePA.java:3456:<init>   BtreePA.java:3455:runVerilogDeleteTest   BtreePA.java:3528:test_verilog_delete   BtreePA.java:3677:newTests   BtreePA.java:3686:main  */
+reg [239:0] T_10;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2506:<init>   BtreePA.java:3470:<init>   BtreePA.java:3469:runVerilogDeleteTest   BtreePA.java:3542:test_verilog_delete   BtreePA.java:3691:newTests   BtreePA.java:3700:main  */
 task initialize_memory_T_10;
     begin
         T_10[0] <= 1;

diff --git a/verilog/delete/2/delete b/verilog/delete/2/delete
diff --git a/verilog/delete/2/delete.v b/verilog/delete/2/delete.v
diff --git a/verilog/delete/2/includes/M.vh b/verilog/delete/2/includes/M.vh
@@ -1,4 +1,4 @@
-reg [282:0] M_9;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2491:<init>   BtreePA.java:3456:<init>   BtreePA.java:3455:runVerilogDeleteTest   BtreePA.java:3520:test_verilog_delete   BtreePA.java:3677:newTests   BtreePA.java:3686:main  */
+reg [282:0] M_9;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2505:<init>   BtreePA.java:3470:<init>   BtreePA.java:3469:runVerilogDeleteTest   BtreePA.java:3534:test_verilog_delete   BtreePA.java:3691:newTests   BtreePA.java:3700:main  */
 task initialize_memory_M_9;
     begin
         M_9[0] <= 1;

diff --git a/verilog/delete/2/includes/T.vh b/verilog/delete/2/includes/T.vh
@@ -1,4 +1,4 @@
-reg [239:0] T_10;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2492:<init>   BtreePA.java:3456:<init>   BtreePA.java:3455:runVerilogDeleteTest   BtreePA.java:3520:test_verilog_delete   BtreePA.java:3677:newTests   BtreePA.java:3686:main  */
+reg [239:0] T_10;  /*   MemoryLayoutPA.java:0943:declareVerilog   MemoryLayoutPA.java:0926:dumpVerilog   BtreePA.java:2506:<init>   BtreePA.java:3470:<init>   BtreePA.java:3469:runVerilogDeleteTest   BtreePA.java:3534:test_verilog_delete   BtreePA.java:3691:newTests   BtreePA.java:3700:main  */
 task initialize_memory_T_10;
     begin
         T_10[0] <= 1;