Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis15/src/compiler/tree-ir/tree-ops.sml
ViewVC logotype

Diff of /branches/vis15/src/compiler/tree-ir/tree-ops.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4055, Mon Jun 27 14:31:45 2016 UTC revision 4056, Mon Jun 27 15:26:20 2016 UTC
# Line 93  Line 93 
93        | VMul of int * int        | VMul of int * int
94        | VNeg of int * int        | VNeg of int * int
95        | VSum of int * int        | VSum of int * int
96          | VDot of int * int
97        | VIndex of int * int * int        | VIndex of int * int * int
98        | VClamp of int * int        | VClamp of int * int
99        | VMapClamp of int * int        | VMapClamp of int * int
# Line 179  Line 180 
180        | resultArity (VMul _) = 1        | resultArity (VMul _) = 1
181        | resultArity (VNeg _) = 1        | resultArity (VNeg _) = 1
182        | resultArity (VSum _) = 1        | resultArity (VSum _) = 1
183          | resultArity (VDot _) = 1
184        | resultArity (VIndex _) = 1        | resultArity (VIndex _) = 1
185        | resultArity (VClamp _) = 1        | resultArity (VClamp _) = 1
186        | resultArity (VMapClamp _) = 1        | resultArity (VMapClamp _) = 1
# Line 265  Line 267 
267        | arity (VMul _) = 2        | arity (VMul _) = 2
268        | arity (VNeg _) = 2        | arity (VNeg _) = 2
269        | arity (VSum _) = 1        | arity (VSum _) = 1
270          | arity (VDot _) = 2
271        | arity (VIndex _) = 1        | arity (VIndex _) = 1
272        | arity (VClamp _) = 3        | arity (VClamp _) = 3
273        | arity (VMapClamp _) = 3        | arity (VMapClamp _) = 3
# Line 357  Line 360 
360        | same (VMul(a0,a1), VMul(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)        | same (VMul(a0,a1), VMul(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
361        | same (VNeg(a0,a1), VNeg(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)        | same (VNeg(a0,a1), VNeg(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
362        | same (VSum(a0,a1), VSum(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)        | same (VSum(a0,a1), VSum(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
363          | same (VDot(a0,a1), VDot(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
364        | same (VIndex(a0,a1,a2), VIndex(b0,b1,b2)) = sameint(a0, b0) andalso sameint(a1, b1) andalso sameint(a2, b2)        | same (VIndex(a0,a1,a2), VIndex(b0,b1,b2)) = sameint(a0, b0) andalso sameint(a1, b1) andalso sameint(a2, b2)
365        | same (VClamp(a0,a1), VClamp(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)        | same (VClamp(a0,a1), VClamp(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
366        | same (VMapClamp(a0,a1), VMapClamp(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)        | same (VMapClamp(a0,a1), VMapClamp(b0,b1)) = sameint(a0, b0) andalso sameint(a1, b1)
# Line 444  Line 448 
448        | hash (VMul(a0,a1)) = 0w137 + hashint a0 + hashint a1        | hash (VMul(a0,a1)) = 0w137 + hashint a0 + hashint a1
449        | hash (VNeg(a0,a1)) = 0w139 + hashint a0 + hashint a1        | hash (VNeg(a0,a1)) = 0w139 + hashint a0 + hashint a1
450        | hash (VSum(a0,a1)) = 0w149 + hashint a0 + hashint a1        | hash (VSum(a0,a1)) = 0w149 + hashint a0 + hashint a1
451        | hash (VIndex(a0,a1,a2)) = 0w151 + hashint a0 + hashint a1 + hashint a2        | hash (VDot(a0,a1)) = 0w151 + hashint a0 + hashint a1
452        | hash (VClamp(a0,a1)) = 0w157 + hashint a0 + hashint a1        | hash (VIndex(a0,a1,a2)) = 0w157 + hashint a0 + hashint a1 + hashint a2
453        | hash (VMapClamp(a0,a1)) = 0w163 + hashint a0 + hashint a1        | hash (VClamp(a0,a1)) = 0w163 + hashint a0 + hashint a1
454        | hash (VLerp(a0,a1)) = 0w167 + hashint a0 + hashint a1        | hash (VMapClamp(a0,a1)) = 0w167 + hashint a0 + hashint a1
455        | hash (VCeiling(a0,a1)) = 0w173 + hashint a0 + hashint a1        | hash (VLerp(a0,a1)) = 0w173 + hashint a0 + hashint a1
456        | hash (VFloor(a0,a1)) = 0w179 + hashint a0 + hashint a1        | hash (VCeiling(a0,a1)) = 0w179 + hashint a0 + hashint a1
457        | hash (VRound(a0,a1)) = 0w181 + hashint a0 + hashint a1        | hash (VFloor(a0,a1)) = 0w181 + hashint a0 + hashint a1
458        | hash (VTrunc(a0,a1)) = 0w191 + hashint a0 + hashint a1        | hash (VRound(a0,a1)) = 0w191 + hashint a0 + hashint a1
459        | hash (VToInt(a0,a1)) = 0w193 + hashint a0 + hashint a1        | hash (VTrunc(a0,a1)) = 0w193 + hashint a0 + hashint a1
460        | hash (TensorIndex(a0,a1)) = 0w197 + hashty a0 + hashshape a1        | hash (VToInt(a0,a1)) = 0w197 + hashint a0 + hashint a1
461        | hash (ProjectLast(a0,a1)) = 0w199 + hashty a0 + hashshape a1        | hash (TensorIndex(a0,a1)) = 0w199 + hashty a0 + hashshape a1
462        | hash (TensorCopy(a0)) = 0w211 + hashshape a0        | hash (ProjectLast(a0,a1)) = 0w211 + hashty a0 + hashshape a1
463        | hash (TensorRef(a0)) = 0w223 + hashshape a0        | hash (TensorCopy(a0)) = 0w223 + hashshape a0
464        | hash EigenVecs2x2 = 0w227        | hash (TensorRef(a0)) = 0w227 + hashshape a0
465        | hash EigenVecs3x3 = 0w229        | hash EigenVecs2x2 = 0w229
466        | hash EigenVals2x2 = 0w233        | hash EigenVecs3x3 = 0w233
467        | hash EigenVals3x3 = 0w239        | hash EigenVals2x2 = 0w239
468        | hash (Select(a0,a1)) = 0w241 + hashty a0 + hashint a1        | hash EigenVals3x3 = 0w241
469        | hash (Subscript(a0)) = 0w251 + hashty a0        | hash (Select(a0,a1)) = 0w251 + hashty a0 + hashint a1
470        | hash (MkDynamic(a0,a1)) = 0w257 + hashty a0 + hashint a1        | hash (Subscript(a0)) = 0w257 + hashty a0
471        | hash (Append(a0)) = 0w263 + hashty a0        | hash (MkDynamic(a0,a1)) = 0w263 + hashty a0 + hashint a1
472        | hash (Prepend(a0)) = 0w269 + hashty a0        | hash (Append(a0)) = 0w269 + hashty a0
473        | hash (Concat(a0)) = 0w271 + hashty a0        | hash (Prepend(a0)) = 0w271 + hashty a0
474        | hash Range = 0w277        | hash (Concat(a0)) = 0w277 + hashty a0
475        | hash (Length(a0)) = 0w281 + hashty a0        | hash Range = 0w281
476        | hash (SphereQuery(a0,a1)) = 0w283 + hashty a0 + hashty a1        | hash (Length(a0)) = 0w283 + hashty a0
477        | hash Sqrt = 0w293        | hash (SphereQuery(a0,a1)) = 0w293 + hashty a0 + hashty a1
478        | hash Cos = 0w307        | hash Sqrt = 0w307
479        | hash ArcCos = 0w311        | hash Cos = 0w311
480        | hash Sin = 0w313        | hash ArcCos = 0w313
481        | hash ArcSin = 0w317        | hash Sin = 0w317
482        | hash Tan = 0w331        | hash ArcSin = 0w331
483        | hash ArcTan = 0w337        | hash Tan = 0w337
484        | hash Exp = 0w347        | hash ArcTan = 0w347
485        | hash IntToReal = 0w349        | hash Exp = 0w349
486        | hash (R_All(a0)) = 0w353 + hashty a0        | hash IntToReal = 0w353
487        | hash (R_Exists(a0)) = 0w359 + hashty a0        | hash (R_All(a0)) = 0w359 + hashty a0
488        | hash (R_Max(a0)) = 0w367 + hashty a0        | hash (R_Exists(a0)) = 0w367 + hashty a0
489        | hash (R_Min(a0)) = 0w373 + hashty a0        | hash (R_Max(a0)) = 0w373 + hashty a0
490        | hash (R_Sum(a0)) = 0w379 + hashty a0        | hash (R_Min(a0)) = 0w379 + hashty a0
491        | hash (R_Product(a0)) = 0w383 + hashty a0        | hash (R_Sum(a0)) = 0w383 + hashty a0
492        | hash (R_Mean(a0)) = 0w389 + hashty a0        | hash (R_Product(a0)) = 0w389 + hashty a0
493        | hash (R_Variance(a0)) = 0w397 + hashty a0        | hash (R_Mean(a0)) = 0w397 + hashty a0
494        | hash (Transform(a0)) = 0w401 + ImageInfo.hash a0        | hash (R_Variance(a0)) = 0w401 + hashty a0
495        | hash (Translate(a0)) = 0w409 + ImageInfo.hash a0        | hash (Transform(a0)) = 0w409 + ImageInfo.hash a0
496        | hash (BaseAddress(a0)) = 0w419 + ImageInfo.hash a0        | hash (Translate(a0)) = 0w419 + ImageInfo.hash a0
497        | hash (ControlIndex(a0,a1,a2)) = 0w421 + ImageInfo.hash a0 + hashidxctl a1 + hashint a2        | hash (BaseAddress(a0)) = 0w421 + ImageInfo.hash a0
498        | hash (LoadVoxel(a0)) = 0w431 + ImageInfo.hash a0        | hash (ControlIndex(a0,a1,a2)) = 0w431 + ImageInfo.hash a0 + hashidxctl a1 + hashint a2
499        | hash (Inside(a0,a1)) = 0w433 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxel(a0)) = 0w433 + ImageInfo.hash a0
500        | hash (ImageDim(a0,a1)) = 0w439 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w439 + ImageInfo.hash a0 + hashint a1
501        | hash (MathFn(a0)) = 0w443 + MathFns.hash a0        | hash (ImageDim(a0,a1)) = 0w443 + ImageInfo.hash a0 + hashint a1
502          | hash (MathFn(a0)) = 0w449 + MathFns.hash a0
503    
504      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
505        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 530  Line 535 
535        | toString (VMul(a0,a1)) = concat["VMul<", intToString a0, ",", intToString a1, ">"]        | toString (VMul(a0,a1)) = concat["VMul<", intToString a0, ",", intToString a1, ">"]
536        | toString (VNeg(a0,a1)) = concat["VNeg<", intToString a0, ",", intToString a1, ">"]        | toString (VNeg(a0,a1)) = concat["VNeg<", intToString a0, ",", intToString a1, ">"]
537        | toString (VSum(a0,a1)) = concat["VSum<", intToString a0, ",", intToString a1, ">"]        | toString (VSum(a0,a1)) = concat["VSum<", intToString a0, ",", intToString a1, ">"]
538          | toString (VDot(a0,a1)) = concat["VDot<", intToString a0, ",", intToString a1, ">"]
539        | toString (VIndex(a0,a1,a2)) = concat["VIndex<", intToString a0, ",", intToString a1, ",", intToString a2, ">"]        | toString (VIndex(a0,a1,a2)) = concat["VIndex<", intToString a0, ",", intToString a1, ",", intToString a2, ">"]
540        | toString (VClamp(a0,a1)) = concat["VClamp<", intToString a0, ",", intToString a1, ">"]        | toString (VClamp(a0,a1)) = concat["VClamp<", intToString a0, ",", intToString a1, ">"]
541        | toString (VMapClamp(a0,a1)) = concat["VMapClamp<", intToString a0, ",", intToString a1, ">"]        | toString (VMapClamp(a0,a1)) = concat["VMapClamp<", intToString a0, ",", intToString a1, ">"]

Legend:
Removed from v.4055  
changed lines
  Added in v.4056

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0