Fix incorrect block, thread and grid mixups

(Main mistake was that the order of parameters in AccessInstance was wrong, which lead me down a debugging session.

Also for better naming changed global to local.
As the respective ids are not the entirely global ids, but for example the local thread id in the current block, or the local block id in the current grid

Author: NetroScript

html/src/components/InspectDrawer.svelte

@@ -42,47 +42,47 @@
     </div>
     <div class="flex flex-row justify-around items-center flex-wrap my-2">
       <div class="section-container flex-1 max-w-xl !variant-glass-secondary mx-3">
-        <div class="text-center font-mono">Grid Sizing:</div>
+        <div class="text-center font-mono">Block Sizing:</div>
         <div class="flex flex-row justify-around">
           <div class="description-container mx-3">
             <div class="description-prefix">X:</div>
             <div class="description-content">
-              {$drawerState.currentMemoryRegion.kernelSettings.GridDimensions.x}
+              {$drawerState.currentMemoryRegion.kernelSettings.BlockDimensions.x}
             </div>
           </div>
           <div class="description-container mx-3">
             <div class="description-prefix">Y:</div>
             <div class="description-content">
-              {$drawerState.currentMemoryRegion.kernelSettings.GridDimensions.y}
+              {$drawerState.currentMemoryRegion.kernelSettings.BlockDimensions.y}
             </div>
           </div>
           <div class="description-container mx-3">
             <div class="description-prefix">Z:</div>
             <div class="description-content">
-              {$drawerState.currentMemoryRegion.kernelSettings.GridDimensions.z}
+              {$drawerState.currentMemoryRegion.kernelSettings.BlockDimensions.z}
             </div>
           </div>
         </div>
       </div>
       <div class="section-container flex-1 max-w-xl !variant-glass-secondary mx-3">
-        <div class="text-center font-mono">Block Sizing:</div>
+        <div class="text-center font-mono">Grid Sizing:</div>
         <div class="flex flex-row justify-around">
           <div class="description-container mx-3">
             <div class="description-prefix">X:</div>
             <div class="description-content">
-              {$drawerState.currentMemoryRegion.kernelSettings.BlockDimensions.x}
+              {$drawerState.currentMemoryRegion.kernelSettings.GridDimensions.x}
             </div>
           </div>
           <div class="description-container mx-3">
             <div class="description-prefix">Y:</div>
             <div class="description-content">
-              {$drawerState.currentMemoryRegion.kernelSettings.BlockDimensions.y}
+              {$drawerState.currentMemoryRegion.kernelSettings.GridDimensions.y}
             </div>
           </div>
           <div class="description-container mx-3">
             <div class="description-prefix">Z:</div>
             <div class="description-content">
-              {$drawerState.currentMemoryRegion.kernelSettings.BlockDimensions.z}
+              {$drawerState.currentMemoryRegion.kernelSettings.GridDimensions.z}
             </div>
           </div>
         </div>

html/src/components/MemoryAccessInfo.svelte

@@ -17,23 +17,23 @@
           <div class="description-container">
             <div class="description-prefix">X:</div>
             <div class="description-content">
-              {access.blockID.x}
+              {access.threadID.x}
             </div>
           </div>
           <div class="description-container">
             <div class="description-prefix">Y:</div>
             <div class="description-content">
-              {access.blockID.y}
+              {access.threadID.y}
             </div>
           </div>
           <div class="description-container">
             <div class="description-prefix">Z:</div>
             <div class="description-content">
-              {access.blockID.z}
+              {access.threadID.z}
             </div>
           </div>
           <div class="description-container pl-2">
-            <div class="description-prefix">Global:</div>
+            <div class="description-prefix">1D Local:</div>
             <div class="description-content">
               {access.threadIdGlobal}
             </div>
@@ -62,7 +62,7 @@
             </div>
           </div>
           <div class="description-container pl-2">
-            <div class="description-prefix">Global:</div>
+            <div class="description-prefix">1D Local:</div>
             <div class="description-content">
               {access.blockIdGlobal}
             </div>

html/src/lib/types.ts

@@ -46,8 +46,8 @@ export class AccessInstance {
 
   constructor(
     address: string,
-    threadId: number,
     blockId: number,
+    threadId: number,
     isRead: boolean,
     kernelParameters: GenericInformation
   ) {
@@ -58,9 +58,9 @@ export class AccessInstance {
     this.addressInteger = BigInt(this.address);
 
     this.threadID = {
-      x: this.threadIdGlobal % kernelParameters.GridDimensions.x,
-      y: Math.floor(this.threadIdGlobal / kernelParameters.GridDimensions.x) % kernelParameters.GridDimensions.y,
-      z: Math.floor(this.threadIdGlobal / (kernelParameters.GridDimensions.x * kernelParameters.GridDimensions.y))
+      x: this.threadIdGlobal % kernelParameters.BlockDimensions.x,
+      y: Math.floor(this.threadIdGlobal / kernelParameters.BlockDimensions.x) % kernelParameters.BlockDimensions.y,
+      z: Math.floor(this.threadIdGlobal / (kernelParameters.BlockDimensions.x * kernelParameters.BlockDimensions.y))
     };
 
     this.blockID = {