From 829e0e9591080dacde5977b42382d914f0a94211 Mon Sep 17 00:00:00 2001 From: Bo Wun Cheng Date: Sat, 19 Oct 2024 23:16:20 -0700 Subject: [PATCH] update name of fp_matmul_ijk grap to include the crddrop, also swap the dense and sparse operand of spmm_ijk_crddrop to reflex the usage in sparse ml --- ..._matmul_ijk.gv => fp_matmul_ijk_crddrop.gv} | 18 +++++++++++++++--- .../sam-outputs/onyx-dot/spmm_ijk_crddrop.gv | 10 +++++----- .../onyx-dot/spmm_ijk_crddrop_relu.gv | 10 +++++----- 3 files changed, 25 insertions(+), 13 deletions(-) rename compiler/sam-outputs/onyx-dot/{fp_matmul_ijk.gv => fp_matmul_ijk_crddrop.gv} (82%) diff --git a/compiler/sam-outputs/onyx-dot/fp_matmul_ijk.gv b/compiler/sam-outputs/onyx-dot/fp_matmul_ijk_crddrop.gv similarity index 82% rename from compiler/sam-outputs/onyx-dot/fp_matmul_ijk.gv rename to compiler/sam-outputs/onyx-dot/fp_matmul_ijk_crddrop.gv index 47620e19..684b6b12 100644 --- a/compiler/sam-outputs/onyx-dot/fp_matmul_ijk.gv +++ b/compiler/sam-outputs/onyx-dot/fp_matmul_ijk_crddrop.gv @@ -18,20 +18,23 @@ digraph SAM { 0 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*C1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*C1_dim" sink="true"] 6 [comment="type=arrayvals,tensor=C" label="Array Vals: C" color=green2 shape=box style=filled type="arrayvals" tensor="C"] 9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=compressed,src=true,root=false" label="FiberLookup k: C0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="compressed" src="true" root="false"] + 18 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"] + 19 [comment="type=crddrop,outer=j,inner=k" label="CrdDrop j,k" color=orange shape=box style=filled type="crddrop" outer="j" inner="k"] + 17 -> 16 [label="crd" style=dashed type="crd" comment=""] - 16 -> 2 [label="crd" style=dashed type="crd"] + # 16 -> 2 [label="crd" style=dashed type="crd"] 16 -> 15 [label="crd" style=dashed type="crd"] 15 -> 14 [label="repsig" style=dotted type="repsig"] 14 -> 13 [label="ref" style=bold type="ref"] 13 -> 12 [label="crd" style=dashed type="crd" comment=""] - 12 -> 1 [label="crd" style=dashed type="crd"] + # 12 -> 1 [label="crd" style=dashed type="crd"] 12 -> 11 [label="crd" style=dashed type="crd"] 11 -> 10 [label="repsig" style=dotted type="repsig"] 10 -> 8 [label="ref" style=bold type="ref"] 8 -> 7 [label="crd_in-B" style=dashed type="crd" comment="in-B"] 7 -> 5 [label="ref_out-B" style=bold type="ref" comment="out-B"] 5 -> 4 [label="val" type="val"] - 4 -> 3 [label="val" type="val"] + # 4 -> 3 [label="val" type="val"] 3 -> 0 [label="val" type="val"] 7 -> 6 [label="ref_out-C" style=bold type="ref" comment="out-C"] 6 -> 4 [label="val" type="val"] @@ -40,4 +43,13 @@ digraph SAM { 9 -> 7 [label="crd_in-C" style=dashed type="crd" comment="in-C"] 9 -> 7 [label="ref_in-C" style=bold type="ref" comment="in-C"] 17 -> 10 [label="ref" style=bold type="ref" comment=""] + + 4 -> 19 [label="val_inner-k" type="val" comment="inner-k"] + 12 -> 19 [label="crd_outer-j" style=dashed type="crd" comment="outer-j"] + 18 -> 1 [label="crd_inner-j" style=dashed type="crd" comment="inner-j"] + 19 -> 3 [label="val_inner-k" type="val" comment="inner-k"] + + 19 -> 18 [label="crd_inner-j" style=dashed type="crd" comment="inner-j"] + 16 -> 18 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"] + 18 -> 2 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"] } diff --git a/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop.gv b/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop.gv index 4eaef89b..ba34bb9c 100644 --- a/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop.gv +++ b/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop.gv @@ -1,23 +1,23 @@ digraph SAM { - comment="X=ss01,B=dd01,C=ss10" - 17 [comment="type=fiberlookup,index=i,tensor=B,mode=0,format=dense,src=true,root=true" label="FiberLookup i: B0\ndense" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="B" mode="0" format="dense" src="true" root="true"] + comment="X=ss01,B=ss01,C=dd10" + 17 [comment="type=fiberlookup,index=i,tensor=B,mode=0,format=compressed,src=true,root=true" label="FiberLookup i: B0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="B" mode="0" format="compressed" src="true" root="true"] 16 [comment="type=broadcast" shape=point style=invis type="broadcast"] 2 [comment="type=fiberwrite,index=i,tensor=X,mode=0,format=compressed,segsize=2,crdsize=B0_dim,sink=true" label="FiberWrite i: X0\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="i" tensor="X" mode="0" format="compressed" segsize="2" crdsize="B0_dim" sink="true"] 15 [comment="type=repsiggen,index=i" label="RepeatSignalGenerator i" color=cyan3 shape=box style=filled type="repsiggen" index="i"] 14 [comment="type=repeat,index=i,tensor=C,root=true" label="Repeat i: C" color=cyan2 shape=box style=filled type="repeat" index="i" tensor="C" root="true"] - 13 [comment="type=fiberlookup,index=j,tensor=C,mode=1,format=compressed,src=true,root=false" label="FiberLookup j: C1\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="j" tensor="C" mode="1" format="compressed" src="true" root="false"] + 13 [comment="type=fiberlookup,index=j,tensor=C,mode=1,format=dense,src=true,root=false" label="FiberLookup j: C1\ndense" color=green4 shape=box style=filled type="fiberlookup" index="j" tensor="C" mode="1" format="dense" src="true" root="false"] 12 [comment="type=broadcast" shape=point style=invis type="broadcast"] 1 [comment="type=fiberwrite,index=j,tensor=X,mode=1,format=compressed,segsize=B0_dim+1,crdsize=B0_dim*C1_dim,sink=true" label="FiberWrite j: X1\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="j" tensor="X" mode="1" format="compressed" segsize="B0_dim+1" crdsize="B0_dim*C1_dim" sink="true"] 11 [comment="type=repsiggen,index=j" label="RepeatSignalGenerator j" color=cyan3 shape=box style=filled type="repsiggen" index="j"] 10 [comment="type=repeat,index=j,tensor=B,root=false" label="Repeat j: B" color=cyan2 shape=box style=filled type="repeat" index="j" tensor="B" root="false"] - 8 [comment="type=fiberlookup,index=k,tensor=B,mode=1,format=dense,src=true,root=false" label="FiberLookup k: B1\ndense" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="B" mode="1" format="dense" src="true" root="false"] + 8 [comment="type=fiberlookup,index=k,tensor=B,mode=1,format=compressed,src=true,root=false" label="FiberLookup k: B1\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="B" mode="1" format="compressed" src="true" root="false"] 7 [comment="type=intersect,index=k" label="intersect k" color=purple shape=box style=filled type="intersect" index="k"] 5 [comment="type=arrayvals,tensor=B" label="Array Vals: B" color=green2 shape=box style=filled type="arrayvals" tensor="B"] 4 [comment="type=mul" label="Mul" color=brown shape=box style=filled type="mul"] 3 [comment="type=reduce" label="Reduce" color=brown shape=box style=filled type="reduce"] 0 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*C1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*C1_dim" sink="true"] 6 [comment="type=arrayvals,tensor=C" label="Array Vals: C" color=green2 shape=box style=filled type="arrayvals" tensor="C"] - 9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=compressed,src=true,root=false" label="FiberLookup k: C0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="compressed" src="true" root="false"] + 9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=dense,src=true,root=false" label="FiberLookup k: C0\ndense" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="dense" src="true" root="false"] 18 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"] 19 [comment="type=crddrop,outer=j,inner=k" label="CrdDrop j,k" color=orange shape=box style=filled type="crddrop" outer="j" inner="k"] diff --git a/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop_relu.gv b/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop_relu.gv index f9414be6..fa5d56bf 100644 --- a/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop_relu.gv +++ b/compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop_relu.gv @@ -1,23 +1,23 @@ digraph SAM { - comment="X=ss01,B=dd01,C=ss10" - 17 [comment="type=fiberlookup,index=i,tensor=B,mode=0,format=dense,src=true,root=true" label="FiberLookup i: B0\ndense" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="B" mode="0" format="dense" src="true" root="true"] + comment="X=ss01,B=ss01,C=dd10" + 17 [comment="type=fiberlookup,index=i,tensor=B,mode=0,format=compressed,src=true,root=true" label="FiberLookup i: B0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="i" tensor="B" mode="0" format="compressed" src="true" root="true"] 16 [comment="type=broadcast" shape=point style=invis type="broadcast"] 2 [comment="type=fiberwrite,index=i,tensor=X,mode=0,format=compressed,segsize=2,crdsize=B0_dim,sink=true" label="FiberWrite i: X0\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="i" tensor="X" mode="0" format="compressed" segsize="2" crdsize="B0_dim" sink="true"] 15 [comment="type=repsiggen,index=i" label="RepeatSignalGenerator i" color=cyan3 shape=box style=filled type="repsiggen" index="i"] 14 [comment="type=repeat,index=i,tensor=C,root=true" label="Repeat i: C" color=cyan2 shape=box style=filled type="repeat" index="i" tensor="C" root="true"] - 13 [comment="type=fiberlookup,index=j,tensor=C,mode=1,format=compressed,src=true,root=false" label="FiberLookup j: C1\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="j" tensor="C" mode="1" format="compressed" src="true" root="false"] + 13 [comment="type=fiberlookup,index=j,tensor=C,mode=1,format=dense,src=true,root=false" label="FiberLookup j: C1\ndense" color=green4 shape=box style=filled type="fiberlookup" index="j" tensor="C" mode="1" format="dense" src="true" root="false"] 12 [comment="type=broadcast" shape=point style=invis type="broadcast"] 1 [comment="type=fiberwrite,index=j,tensor=X,mode=1,format=compressed,segsize=B0_dim+1,crdsize=B0_dim*C1_dim,sink=true" label="FiberWrite j: X1\ncompressed" color=green3 shape=box style=filled type="fiberwrite" index="j" tensor="X" mode="1" format="compressed" segsize="B0_dim+1" crdsize="B0_dim*C1_dim" sink="true"] 11 [comment="type=repsiggen,index=j" label="RepeatSignalGenerator j" color=cyan3 shape=box style=filled type="repsiggen" index="j"] 10 [comment="type=repeat,index=j,tensor=B,root=false" label="Repeat j: B" color=cyan2 shape=box style=filled type="repeat" index="j" tensor="B" root="false"] - 8 [comment="type=fiberlookup,index=k,tensor=B,mode=1,format=dense,src=true,root=false" label="FiberLookup k: B1\ndense" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="B" mode="1" format="dense" src="true" root="false"] + 8 [comment="type=fiberlookup,index=k,tensor=B,mode=1,format=compressed,src=true,root=false" label="FiberLookup k: B1\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="B" mode="1" format="compressed" src="true" root="false"] 7 [comment="type=intersect,index=k" label="intersect k" color=purple shape=box style=filled type="intersect" index="k"] 5 [comment="type=arrayvals,tensor=B" label="Array Vals: B" color=green2 shape=box style=filled type="arrayvals" tensor="B"] 4 [comment="type=mul" label="Mul" color=brown shape=box style=filled type="mul"] 3 [comment="type=reduce" label="Reduce" color=brown shape=box style=filled type="reduce"] 0 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*C1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*C1_dim" sink="true"] 6 [comment="type=arrayvals,tensor=C" label="Array Vals: C" color=green2 shape=box style=filled type="arrayvals" tensor="C"] - 9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=compressed,src=true,root=false" label="FiberLookup k: C0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="compressed" src="true" root="false"] + 9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=dense,src=true,root=false" label="FiberLookup k: C0\ndense" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="dense" src="true" root="false"] 20 [comment="type=smax,const0=0" label="Max 0" color=brown shape=box style=filled type="smax", const0="0"] 21 [comment="type=crddrop,outer=j,inner=val,mode=0" label="CrdDrop Compression j, val" color=orange style=filled type="crddrop" outer="j" inner="val" mode="0"] 22 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"]