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

SCM Repository

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

Diff of /branches/vis15/src/compiler/mid-ir/mid-ir.sml

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

revision 3732, Thu Apr 7 20:56:16 2016 UTC revision 3774, Tue Apr 26 20:03:28 2016 UTC
# Line 103  Line 103 
103        | Kernel of Kernel.kernel * int        | Kernel of Kernel.kernel * int
104        | Transform of ImageInfo.info        | Transform of ImageInfo.info
105        | Translate of ImageInfo.info        | Translate of ImageInfo.info
       | VoxelAddress of ImageInfo.info * int  
       | VoxelAddressWithCtl of ImageInfo.info * int * idxctl  
106        | LoadVoxels of ImageInfo.info * int        | LoadVoxels of ImageInfo.info * int
107          | LoadVoxelsWithCtl of ImageInfo.info * int * idxctl
108        | Inside of ImageInfo.info * int        | Inside of ImageInfo.info * int
109        | ImageDim of ImageInfo.info * int        | ImageDim of ImageInfo.info * int
110        | BorderCtlDefault of ImageInfo.info        | BorderCtlDefault of ImageInfo.info
# Line 169  Line 168 
168        | resultArity (Kernel _) = 1        | resultArity (Kernel _) = 1
169        | resultArity (Transform _) = 1        | resultArity (Transform _) = 1
170        | resultArity (Translate _) = 1        | resultArity (Translate _) = 1
       | resultArity (VoxelAddress _) = 1  
       | resultArity (VoxelAddressWithCtl _) = 1  
171        | resultArity (LoadVoxels _) = 1        | resultArity (LoadVoxels _) = 1
172          | resultArity (LoadVoxelsWithCtl _) = 1
173        | resultArity (Inside _) = 1        | resultArity (Inside _) = 1
174        | resultArity (ImageDim _) = 1        | resultArity (ImageDim _) = 1
175        | resultArity (BorderCtlDefault _) = 1        | resultArity (BorderCtlDefault _) = 1
# Line 235  Line 233 
233        | arity (Kernel _) = 0        | arity (Kernel _) = 0
234        | arity (Transform _) = 1        | arity (Transform _) = 1
235        | arity (Translate _) = 1        | arity (Translate _) = 1
236        | arity (VoxelAddress _) = ~1        | arity (LoadVoxels _) = 2
237        | arity (VoxelAddressWithCtl _) = ~1        | arity (LoadVoxelsWithCtl _) = 2
       | arity (LoadVoxels _) = 1  
238        | arity (Inside _) = 2        | arity (Inside _) = 2
239        | arity (ImageDim _) = 1        | arity (ImageDim _) = 1
240        | arity (BorderCtlDefault _) = 2        | arity (BorderCtlDefault _) = 2
# Line 308  Line 305 
305        | same (Kernel(a0,a1), Kernel(b0,b1)) = Kernel.same(a0, b0) andalso sameint(a1, b1)        | same (Kernel(a0,a1), Kernel(b0,b1)) = Kernel.same(a0, b0) andalso sameint(a1, b1)
306        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)
307        | same (Translate(a0), Translate(b0)) = ImageInfo.same(a0, b0)        | same (Translate(a0), Translate(b0)) = ImageInfo.same(a0, b0)
       | same (VoxelAddress(a0,a1), VoxelAddress(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)  
       | same (VoxelAddressWithCtl(a0,a1,a2), VoxelAddressWithCtl(b0,b1,b2)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1) andalso sameidxctl(a2, b2)  
308        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (LoadVoxels(a0,a1), LoadVoxels(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
309          | same (LoadVoxelsWithCtl(a0,a1,a2), LoadVoxelsWithCtl(b0,b1,b2)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1) andalso sameidxctl(a2, b2)
310        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
311        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
312        | same (BorderCtlDefault(a0), BorderCtlDefault(b0)) = ImageInfo.same(a0, b0)        | same (BorderCtlDefault(a0), BorderCtlDefault(b0)) = ImageInfo.same(a0, b0)
# Line 375  Line 371 
371        | hash (Kernel(a0,a1)) = 0w233 + Kernel.hash a0 + hashint a1        | hash (Kernel(a0,a1)) = 0w233 + Kernel.hash a0 + hashint a1
372        | hash (Transform(a0)) = 0w239 + ImageInfo.hash a0        | hash (Transform(a0)) = 0w239 + ImageInfo.hash a0
373        | hash (Translate(a0)) = 0w241 + ImageInfo.hash a0        | hash (Translate(a0)) = 0w241 + ImageInfo.hash a0
374        | hash (VoxelAddress(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1
375        | hash (VoxelAddressWithCtl(a0,a1,a2)) = 0w257 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2        | hash (LoadVoxelsWithCtl(a0,a1,a2)) = 0w257 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2
376        | hash (LoadVoxels(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1
377        | hash (Inside(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1        | hash (ImageDim(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1
378        | hash (ImageDim(a0,a1)) = 0w271 + ImageInfo.hash a0 + hashint a1        | hash (BorderCtlDefault(a0)) = 0w271 + ImageInfo.hash a0
379        | hash (BorderCtlDefault(a0)) = 0w277 + ImageInfo.hash a0        | hash (BorderCtlClamp(a0)) = 0w277 + ImageInfo.hash a0
380        | hash (BorderCtlClamp(a0)) = 0w281 + ImageInfo.hash a0        | hash (BorderCtlMirror(a0)) = 0w281 + ImageInfo.hash a0
381        | hash (BorderCtlMirror(a0)) = 0w283 + ImageInfo.hash a0        | hash (BorderCtlWrap(a0)) = 0w283 + ImageInfo.hash a0
382        | hash (BorderCtlWrap(a0)) = 0w293 + ImageInfo.hash a0        | hash (LoadSeq(a0,a1)) = 0w293 + hashty a0 + hashstring a1
383        | hash (LoadSeq(a0,a1)) = 0w307 + hashty a0 + hashstring a1        | hash (LoadImage(a0,a1)) = 0w307 + hashty a0 + hashstring a1
384        | hash (LoadImage(a0,a1)) = 0w311 + hashty a0 + hashstring a1        | hash (Print(a0)) = 0w311 + hashtys a0
385        | hash (Print(a0)) = 0w313 + hashtys a0        | hash (MathFn(a0)) = 0w313 + MathFns.hash a0
       | hash (MathFn(a0)) = 0w317 + MathFns.hash a0  
386    
387      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
388        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 441  Line 436 
436        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]
437        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]
438        | toString (Translate(a0)) = concat["Translate<", ImageInfo.toString a0, ">"]        | toString (Translate(a0)) = concat["Translate<", ImageInfo.toString a0, ">"]
       | toString (VoxelAddress(a0,a1)) = concat["VoxelAddress<", ImageInfo.toString a0, ",", intToString a1, ">"]  
       | toString (VoxelAddressWithCtl(a0,a1,a2)) = concat["VoxelAddressWithCtl<", ImageInfo.toString a0, ",", intToString a1, ",", idxctlToString a2, ">"]  
439        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (LoadVoxels(a0,a1)) = concat["LoadVoxels<", ImageInfo.toString a0, ",", intToString a1, ">"]
440          | toString (LoadVoxelsWithCtl(a0,a1,a2)) = concat["LoadVoxelsWithCtl<", ImageInfo.toString a0, ",", intToString a1, ",", idxctlToString a2, ">"]
441        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]
442        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]
443        | toString (BorderCtlDefault(a0)) = concat["BorderCtlDefault<", ImageInfo.toString a0, ">"]        | toString (BorderCtlDefault(a0)) = concat["BorderCtlDefault<", ImageInfo.toString a0, ">"]

Legend:
Removed from v.3732  
changed lines
  Added in v.3774

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