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 4470, Tue Aug 30 14:16:28 2016 UTC revision 4471, Tue Aug 30 14:17:59 2016 UTC
# Line 132  Line 132 
132        | Exp        | Exp
133        | IntToReal        | IntToReal
134        | NumStrands of StrandSets.t        | NumStrands of StrandSets.t
       | Strands of ty * StrandSets.t  
135        | Transform of ImageInfo.t        | Transform of ImageInfo.t
136        | Translate of ImageInfo.t        | Translate of ImageInfo.t
137        | BaseAddress of ImageInfo.t        | BaseAddress of ImageInfo.t
# Line 216  Line 215 
215        | resultArity Exp = 1        | resultArity Exp = 1
216        | resultArity IntToReal = 1        | resultArity IntToReal = 1
217        | resultArity (NumStrands _) = 1        | resultArity (NumStrands _) = 1
       | resultArity (Strands _) = 1  
218        | resultArity (Transform _) = 1        | resultArity (Transform _) = 1
219        | resultArity (Translate _) = 1        | resultArity (Translate _) = 1
220        | resultArity (BaseAddress _) = 1        | resultArity (BaseAddress _) = 1
# Line 300  Line 298 
298        | arity Exp = 1        | arity Exp = 1
299        | arity IntToReal = 1        | arity IntToReal = 1
300        | arity (NumStrands _) = 0        | arity (NumStrands _) = 0
       | arity (Strands _) = 0  
301        | arity (Transform _) = 1        | arity (Transform _) = 1
302        | arity (Translate _) = 1        | arity (Translate _) = 1
303        | arity (BaseAddress _) = 1        | arity (BaseAddress _) = 1
# Line 390  Line 387 
387        | same (Exp, Exp) = true        | same (Exp, Exp) = true
388        | same (IntToReal, IntToReal) = true        | same (IntToReal, IntToReal) = true
389        | same (NumStrands(a0), NumStrands(b0)) = StrandSets.same(a0, b0)        | same (NumStrands(a0), NumStrands(b0)) = StrandSets.same(a0, b0)
       | same (Strands(a0,a1), Strands(b0,b1)) = samety(a0, b0) andalso StrandSets.same(a1, b1)  
390        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)
391        | same (Translate(a0), Translate(b0)) = ImageInfo.same(a0, b0)        | same (Translate(a0), Translate(b0)) = ImageInfo.same(a0, b0)
392        | same (BaseAddress(a0), BaseAddress(b0)) = ImageInfo.same(a0, b0)        | same (BaseAddress(a0), BaseAddress(b0)) = ImageInfo.same(a0, b0)
# Line 475  Line 471 
471        | hash Exp = 0w359        | hash Exp = 0w359
472        | hash IntToReal = 0w367        | hash IntToReal = 0w367
473        | hash (NumStrands(a0)) = 0w373 + StrandSets.hash a0        | hash (NumStrands(a0)) = 0w373 + StrandSets.hash a0
474        | hash (Strands(a0,a1)) = 0w379 + hashty a0 + StrandSets.hash a1        | hash (Transform(a0)) = 0w379 + ImageInfo.hash a0
475        | hash (Transform(a0)) = 0w383 + ImageInfo.hash a0        | hash (Translate(a0)) = 0w383 + ImageInfo.hash a0
476        | hash (Translate(a0)) = 0w389 + ImageInfo.hash a0        | hash (BaseAddress(a0)) = 0w389 + ImageInfo.hash a0
477        | hash (BaseAddress(a0)) = 0w397 + ImageInfo.hash a0        | hash (ControlIndex(a0,a1,a2)) = 0w397 + ImageInfo.hash a0 + hashidxctl a1 + hashint a2
478        | hash (ControlIndex(a0,a1,a2)) = 0w401 + ImageInfo.hash a0 + hashidxctl a1 + hashint a2        | hash (LoadVoxel(a0)) = 0w401 + ImageInfo.hash a0
479        | hash (LoadVoxel(a0)) = 0w409 + ImageInfo.hash a0        | hash (Inside(a0,a1,a2)) = 0w409 + VectorLayout.hash a0 + ImageInfo.hash a1 + hashint a2
480        | hash (Inside(a0,a1,a2)) = 0w419 + VectorLayout.hash a0 + ImageInfo.hash a1 + hashint a2        | hash (IndexInside(a0,a1)) = 0w419 + ImageInfo.hash a0 + hashint a1
481        | hash (IndexInside(a0,a1)) = 0w421 + ImageInfo.hash a0 + hashint a1        | hash (ImageDim(a0,a1)) = 0w421 + ImageInfo.hash a0 + hashint a1
482        | hash (ImageDim(a0,a1)) = 0w431 + ImageInfo.hash a0 + hashint a1        | hash (MathFn(a0)) = 0w431 + MathFns.hash a0
       | hash (MathFn(a0)) = 0w433 + MathFns.hash a0  
483    
484      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
485        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 559  Line 554 
554        | toString Exp = "Exp"        | toString Exp = "Exp"
555        | toString IntToReal = "IntToReal"        | toString IntToReal = "IntToReal"
556        | toString (NumStrands(a0)) = concat["NumStrands<", StrandSets.toString a0, ">"]        | toString (NumStrands(a0)) = concat["NumStrands<", StrandSets.toString a0, ">"]
       | toString (Strands(a0,a1)) = concat["Strands<", tyToString a0, ",", StrandSets.toString a1, ">"]  
557        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]
558        | toString (Translate(a0)) = concat["Translate<", ImageInfo.toString a0, ">"]        | toString (Translate(a0)) = concat["Translate<", ImageInfo.toString a0, ">"]
559        | toString (BaseAddress(a0)) = concat["BaseAddress<", ImageInfo.toString a0, ">"]        | toString (BaseAddress(a0)) = concat["BaseAddress<", ImageInfo.toString a0, ">"]

Legend:
Removed from v.4470  
changed lines
  Added in v.4471

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