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 3508, Fri Dec 18 14:19:30 2015 UTC revision 3652, Tue Feb 2 20:23:12 2016 UTC
# Line 23  Line 23 
23      type tys = ty list      type tys = ty list
24      fun sametys (tys1, tys2) = ListPair.allEq samety (tys1, tys2)      fun sametys (tys1, tys2) = ListPair.allEq samety (tys1, tys2)
25      fun hashtys tys = List.foldl (fn (ty, s) => hashty ty + 0w3 * s) 0w0 tys      fun hashtys tys = List.foldl (fn (ty, s) => hashty ty + 0w3 * s) 0w0 tys
26      fun tysToString tys = String.concat["[", String.concatWith "," (List.map tyToString tys), "]" ]      fun tysToString tys = String.concat["[", String.concatWithMap "," tyToString tys, "]" ]
27    
28    (* required helper functions for the int type *)    (* required helper functions for the int type *)
29      fun sameint (i1 : int, i2) = (i1 = i2)      fun sameint (i1 : int, i2) = (i1 = i2)
# Line 69  Line 69 
69        | Min of ty        | Min of ty
70        | Clamp of ty        | Clamp of ty
71        | Lerp of ty        | Lerp of ty
       | Normalize of int  
       | PrincipleEvec of ty  
72        | EigenVecs2x2        | EigenVecs2x2
73        | EigenVecs3x3        | EigenVecs3x3
74        | EigenVals2x2        | EigenVals2x2
# Line 85  Line 83 
83        | Concat of ty        | Concat of ty
84        | Range        | Range
85        | Length of ty        | Length of ty
86          | SphereQuery of ty * ty
87        | Ceiling of int        | Ceiling of int
88        | Floor of int        | Floor of int
89        | Round of int        | Round of int
90        | Trunc of int        | Trunc of int
91        | IntToReal        | IntToReal
92        | RealToInt of int        | RealToInt of int
93          | R_All of ty
94          | R_Exists of ty
95          | R_Max of ty
96          | R_Min of ty
97          | R_Sum of ty
98          | R_Product of ty
99          | R_Mean of ty
100          | R_Variance of ty
101        | Kernel of Kernel.kernel * int        | Kernel of Kernel.kernel * int
102        | Transform of ImageInfo.info        | Transform of ImageInfo.info
103        | Translate of ImageInfo.info        | Translate of ImageInfo.info
# Line 103  Line 110 
110        | LoadSeq of ty * string        | LoadSeq of ty * string
111        | LoadImage of ty * string        | LoadImage of ty * string
112        | Print of tys        | Print of tys
113          | MathFn of MathFns.t
114    
115      fun resultArity IAdd = 1      fun resultArity IAdd = 1
116        | resultArity ISub = 1        | resultArity ISub = 1
# Line 122  Line 130 
130        | resultArity (Min _) = 1        | resultArity (Min _) = 1
131        | resultArity (Clamp _) = 1        | resultArity (Clamp _) = 1
132        | resultArity (Lerp _) = 1        | resultArity (Lerp _) = 1
       | resultArity (Normalize _) = 1  
       | resultArity (PrincipleEvec _) = 1  
133        | resultArity EigenVecs2x2 = 1        | resultArity EigenVecs2x2 = 1
134        | resultArity EigenVecs3x3 = 1        | resultArity EigenVecs3x3 = 1
135        | resultArity EigenVals2x2 = 1        | resultArity EigenVals2x2 = 1
# Line 138  Line 144 
144        | resultArity (Concat _) = 2        | resultArity (Concat _) = 2
145        | resultArity Range = 2        | resultArity Range = 2
146        | resultArity (Length _) = 1        | resultArity (Length _) = 1
147          | resultArity (SphereQuery _) = 1
148        | resultArity (Ceiling _) = 1        | resultArity (Ceiling _) = 1
149        | resultArity (Floor _) = 1        | resultArity (Floor _) = 1
150        | resultArity (Round _) = 1        | resultArity (Round _) = 1
151        | resultArity (Trunc _) = 1        | resultArity (Trunc _) = 1
152        | resultArity IntToReal = 1        | resultArity IntToReal = 1
153        | resultArity (RealToInt _) = 1        | resultArity (RealToInt _) = 1
154          | resultArity (R_All _) = 1
155          | resultArity (R_Exists _) = 1
156          | resultArity (R_Max _) = 1
157          | resultArity (R_Min _) = 1
158          | resultArity (R_Sum _) = 1
159          | resultArity (R_Product _) = 1
160          | resultArity (R_Mean _) = 1
161          | resultArity (R_Variance _) = 1
162        | resultArity (Kernel _) = 1        | resultArity (Kernel _) = 1
163        | resultArity (Transform _) = 1        | resultArity (Transform _) = 1
164        | resultArity (Translate _) = 1        | resultArity (Translate _) = 1
# Line 156  Line 171 
171        | resultArity (LoadSeq _) = 1        | resultArity (LoadSeq _) = 1
172        | resultArity (LoadImage _) = 1        | resultArity (LoadImage _) = 1
173        | resultArity (Print _) = 0        | resultArity (Print _) = 0
174          | resultArity (MathFn _) = 1
175    
176      fun arity IAdd = 2      fun arity IAdd = 2
177        | arity ISub = 2        | arity ISub = 2
# Line 175  Line 191 
191        | arity (Min _) = 2        | arity (Min _) = 2
192        | arity (Clamp _) = 3        | arity (Clamp _) = 3
193        | arity (Lerp _) = 3        | arity (Lerp _) = 3
       | arity (Normalize _) = 1  
       | arity (PrincipleEvec _) = 2  
194        | arity EigenVecs2x2 = 1        | arity EigenVecs2x2 = 1
195        | arity EigenVecs3x3 = 1        | arity EigenVecs3x3 = 1
196        | arity EigenVals2x2 = 1        | arity EigenVals2x2 = 1
# Line 191  Line 205 
205        | arity (Concat _) = 1        | arity (Concat _) = 1
206        | arity Range = 1        | arity Range = 1
207        | arity (Length _) = 1        | arity (Length _) = 1
208          | arity (SphereQuery _) = 2
209        | arity (Ceiling _) = 1        | arity (Ceiling _) = 1
210        | arity (Floor _) = 1        | arity (Floor _) = 1
211        | arity (Round _) = 1        | arity (Round _) = 1
212        | arity (Trunc _) = 1        | arity (Trunc _) = 1
213        | arity IntToReal = 1        | arity IntToReal = 1
214        | arity (RealToInt _) = 1        | arity (RealToInt _) = 1
215          | arity (R_All _) = 3
216          | arity (R_Exists _) = 3
217          | arity (R_Max _) = 3
218          | arity (R_Min _) = 3
219          | arity (R_Sum _) = 3
220          | arity (R_Product _) = 3
221          | arity (R_Mean _) = 3
222          | arity (R_Variance _) = 4
223        | arity (Kernel _) = 0        | arity (Kernel _) = 0
224        | arity (Transform _) = 1        | arity (Transform _) = 1
225        | arity (Translate _) = 1        | arity (Translate _) = 1
# Line 209  Line 232 
232        | arity (LoadSeq _) = 0        | arity (LoadSeq _) = 0
233        | arity (LoadImage _) = 0        | arity (LoadImage _) = 0
234        | arity (Print _) = ~1        | arity (Print _) = ~1
235          | arity (MathFn _) = ~1
236    
237      fun isPure (MkDynamic _) = false      fun isPure (MkDynamic _) = false
238        | isPure (Append _) = false        | isPure (Append _) = false
# Line 235  Line 259 
259        | same (Min(a0), Min(b0)) = samety(a0, b0)        | same (Min(a0), Min(b0)) = samety(a0, b0)
260        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)
261        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)
       | same (Normalize(a0), Normalize(b0)) = sameint(a0, b0)  
       | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)  
262        | same (EigenVecs2x2, EigenVecs2x2) = true        | same (EigenVecs2x2, EigenVecs2x2) = true
263        | same (EigenVecs3x3, EigenVecs3x3) = true        | same (EigenVecs3x3, EigenVecs3x3) = true
264        | same (EigenVals2x2, EigenVals2x2) = true        | same (EigenVals2x2, EigenVals2x2) = true
# Line 251  Line 273 
273        | same (Concat(a0), Concat(b0)) = samety(a0, b0)        | same (Concat(a0), Concat(b0)) = samety(a0, b0)
274        | same (Range, Range) = true        | same (Range, Range) = true
275        | same (Length(a0), Length(b0)) = samety(a0, b0)        | same (Length(a0), Length(b0)) = samety(a0, b0)
276          | same (SphereQuery(a0,a1), SphereQuery(b0,b1)) = samety(a0, b0) andalso samety(a1, b1)
277        | same (Ceiling(a0), Ceiling(b0)) = sameint(a0, b0)        | same (Ceiling(a0), Ceiling(b0)) = sameint(a0, b0)
278        | same (Floor(a0), Floor(b0)) = sameint(a0, b0)        | same (Floor(a0), Floor(b0)) = sameint(a0, b0)
279        | same (Round(a0), Round(b0)) = sameint(a0, b0)        | same (Round(a0), Round(b0)) = sameint(a0, b0)
280        | same (Trunc(a0), Trunc(b0)) = sameint(a0, b0)        | same (Trunc(a0), Trunc(b0)) = sameint(a0, b0)
281        | same (IntToReal, IntToReal) = true        | same (IntToReal, IntToReal) = true
282        | same (RealToInt(a0), RealToInt(b0)) = sameint(a0, b0)        | same (RealToInt(a0), RealToInt(b0)) = sameint(a0, b0)
283          | same (R_All(a0), R_All(b0)) = samety(a0, b0)
284          | same (R_Exists(a0), R_Exists(b0)) = samety(a0, b0)
285          | same (R_Max(a0), R_Max(b0)) = samety(a0, b0)
286          | same (R_Min(a0), R_Min(b0)) = samety(a0, b0)
287          | same (R_Sum(a0), R_Sum(b0)) = samety(a0, b0)
288          | same (R_Product(a0), R_Product(b0)) = samety(a0, b0)
289          | same (R_Mean(a0), R_Mean(b0)) = samety(a0, b0)
290          | same (R_Variance(a0), R_Variance(b0)) = samety(a0, b0)
291        | 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)
292        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)        | same (Transform(a0), Transform(b0)) = ImageInfo.same(a0, b0)
293        | same (Translate(a0), Translate(b0)) = ImageInfo.same(a0, b0)        | same (Translate(a0), Translate(b0)) = ImageInfo.same(a0, b0)
# Line 269  Line 300 
300        | same (LoadSeq(a0,a1), LoadSeq(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (LoadSeq(a0,a1), LoadSeq(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
301        | same (LoadImage(a0,a1), LoadImage(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)        | same (LoadImage(a0,a1), LoadImage(b0,b1)) = samety(a0, b0) andalso samestring(a1, b1)
302        | same (Print(a0), Print(b0)) = sametys(a0, b0)        | same (Print(a0), Print(b0)) = sametys(a0, b0)
303          | same (MathFn(a0), MathFn(b0)) = MathFns.same(a0, b0)
304        | same _ = false        | same _ = false
305    
306      fun hash IAdd = 0w3      fun hash IAdd = 0w3
# Line 289  Line 321 
321        | hash (Min(a0)) = 0w59 + hashty a0        | hash (Min(a0)) = 0w59 + hashty a0
322        | hash (Clamp(a0)) = 0w61 + hashty a0        | hash (Clamp(a0)) = 0w61 + hashty a0
323        | hash (Lerp(a0)) = 0w67 + hashty a0        | hash (Lerp(a0)) = 0w67 + hashty a0
324        | hash (Normalize(a0)) = 0w71 + hashint a0        | hash EigenVecs2x2 = 0w71
325        | hash (PrincipleEvec(a0)) = 0w73 + hashty a0        | hash EigenVecs3x3 = 0w73
326        | hash EigenVecs2x2 = 0w79        | hash EigenVals2x2 = 0w79
327        | hash EigenVecs3x3 = 0w83        | hash EigenVals3x3 = 0w83
328        | hash EigenVals2x2 = 0w89        | hash (Zero(a0)) = 0w89 + hashty a0
329        | hash EigenVals3x3 = 0w97        | hash (Select(a0,a1)) = 0w97 + hashty a0 + hashint a1
330        | hash (Zero(a0)) = 0w101 + hashty a0        | hash (Index(a0,a1)) = 0w101 + hashty a0 + hashint a1
331        | hash (Select(a0,a1)) = 0w103 + hashty a0 + hashint a1        | hash (Subscript(a0)) = 0w103 + hashty a0
332        | hash (Index(a0,a1)) = 0w107 + hashty a0 + hashint a1        | hash (MkDynamic(a0,a1)) = 0w107 + hashty a0 + hashint a1
333        | hash (Subscript(a0)) = 0w109 + hashty a0        | hash (Append(a0)) = 0w109 + hashty a0
334        | hash (MkDynamic(a0,a1)) = 0w113 + hashty a0 + hashint a1        | hash (Prepend(a0)) = 0w113 + hashty a0
335        | hash (Append(a0)) = 0w127 + hashty a0        | hash (Concat(a0)) = 0w127 + hashty a0
336        | hash (Prepend(a0)) = 0w131 + hashty a0        | hash Range = 0w131
337        | hash (Concat(a0)) = 0w137 + hashty a0        | hash (Length(a0)) = 0w137 + hashty a0
338        | hash Range = 0w139        | hash (SphereQuery(a0,a1)) = 0w139 + hashty a0 + hashty a1
339        | hash (Length(a0)) = 0w149 + hashty a0        | hash (Ceiling(a0)) = 0w149 + hashint a0
340        | hash (Ceiling(a0)) = 0w151 + hashint a0        | hash (Floor(a0)) = 0w151 + hashint a0
341        | hash (Floor(a0)) = 0w157 + hashint a0        | hash (Round(a0)) = 0w157 + hashint a0
342        | hash (Round(a0)) = 0w163 + hashint a0        | hash (Trunc(a0)) = 0w163 + hashint a0
343        | hash (Trunc(a0)) = 0w167 + hashint a0        | hash IntToReal = 0w167
344        | hash IntToReal = 0w173        | hash (RealToInt(a0)) = 0w173 + hashint a0
345        | hash (RealToInt(a0)) = 0w179 + hashint a0        | hash (R_All(a0)) = 0w179 + hashty a0
346        | hash (Kernel(a0,a1)) = 0w181 + Kernel.hash a0 + hashint a1        | hash (R_Exists(a0)) = 0w181 + hashty a0
347        | hash (Transform(a0)) = 0w191 + ImageInfo.hash a0        | hash (R_Max(a0)) = 0w191 + hashty a0
348        | hash (Translate(a0)) = 0w193 + ImageInfo.hash a0        | hash (R_Min(a0)) = 0w193 + hashty a0
349        | hash (EvalKernel(a0,a1,a2)) = 0w197 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (R_Sum(a0)) = 0w197 + hashty a0
350        | hash (VoxelAddress(a0,a1)) = 0w199 + ImageInfo.hash a0 + hashint a1        | hash (R_Product(a0)) = 0w199 + hashty a0
351        | hash (VoxelAddressWithCtl(a0,a1,a2)) = 0w211 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2        | hash (R_Mean(a0)) = 0w211 + hashty a0
352        | hash (LoadVoxels(a0,a1)) = 0w223 + ImageInfo.hash a0 + hashint a1        | hash (R_Variance(a0)) = 0w223 + hashty a0
353        | hash (Inside(a0,a1)) = 0w227 + ImageInfo.hash a0 + hashint a1        | hash (Kernel(a0,a1)) = 0w227 + Kernel.hash a0 + hashint a1
354        | hash (ImageDim(a0,a1)) = 0w229 + ImageInfo.hash a0 + hashint a1        | hash (Transform(a0)) = 0w229 + ImageInfo.hash a0
355        | hash (LoadSeq(a0,a1)) = 0w233 + hashty a0 + hashstring a1        | hash (Translate(a0)) = 0w233 + ImageInfo.hash a0
356        | hash (LoadImage(a0,a1)) = 0w239 + hashty a0 + hashstring a1        | hash (EvalKernel(a0,a1,a2)) = 0w239 + hashint a0 + Kernel.hash a1 + hashint a2
357        | hash (Print(a0)) = 0w241 + hashtys a0        | hash (VoxelAddress(a0,a1)) = 0w241 + ImageInfo.hash a0 + hashint a1
358          | hash (VoxelAddressWithCtl(a0,a1,a2)) = 0w251 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2
359          | hash (LoadVoxels(a0,a1)) = 0w257 + ImageInfo.hash a0 + hashint a1
360          | hash (Inside(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1
361          | hash (ImageDim(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1
362          | hash (LoadSeq(a0,a1)) = 0w271 + hashty a0 + hashstring a1
363          | hash (LoadImage(a0,a1)) = 0w277 + hashty a0 + hashstring a1
364          | hash (Print(a0)) = 0w281 + hashtys a0
365          | hash (MathFn(a0)) = 0w283 + MathFns.hash a0
366    
367      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
368        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 342  Line 382 
382        | toString (Min(a0)) = concat["Min<", tyToString a0, ">"]        | toString (Min(a0)) = concat["Min<", tyToString a0, ">"]
383        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]
384        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]
       | toString (Normalize(a0)) = concat["Normalize<", intToString a0, ">"]  
       | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]  
385        | toString EigenVecs2x2 = "EigenVecs2x2"        | toString EigenVecs2x2 = "EigenVecs2x2"
386        | toString EigenVecs3x3 = "EigenVecs3x3"        | toString EigenVecs3x3 = "EigenVecs3x3"
387        | toString EigenVals2x2 = "EigenVals2x2"        | toString EigenVals2x2 = "EigenVals2x2"
# Line 358  Line 396 
396        | toString (Concat(a0)) = concat["Concat<", tyToString a0, ">"]        | toString (Concat(a0)) = concat["Concat<", tyToString a0, ">"]
397        | toString Range = "Range"        | toString Range = "Range"
398        | toString (Length(a0)) = concat["Length<", tyToString a0, ">"]        | toString (Length(a0)) = concat["Length<", tyToString a0, ">"]
399          | toString (SphereQuery(a0,a1)) = concat["SphereQuery<", tyToString a0, ",", tyToString a1, ">"]
400        | toString (Ceiling(a0)) = concat["Ceiling<", intToString a0, ">"]        | toString (Ceiling(a0)) = concat["Ceiling<", intToString a0, ">"]
401        | toString (Floor(a0)) = concat["Floor<", intToString a0, ">"]        | toString (Floor(a0)) = concat["Floor<", intToString a0, ">"]
402        | toString (Round(a0)) = concat["Round<", intToString a0, ">"]        | toString (Round(a0)) = concat["Round<", intToString a0, ">"]
403        | toString (Trunc(a0)) = concat["Trunc<", intToString a0, ">"]        | toString (Trunc(a0)) = concat["Trunc<", intToString a0, ">"]
404        | toString IntToReal = "IntToReal"        | toString IntToReal = "IntToReal"
405        | toString (RealToInt(a0)) = concat["RealToInt<", intToString a0, ">"]        | toString (RealToInt(a0)) = concat["RealToInt<", intToString a0, ">"]
406          | toString (R_All(a0)) = concat["R_All<", tyToString a0, ">"]
407          | toString (R_Exists(a0)) = concat["R_Exists<", tyToString a0, ">"]
408          | toString (R_Max(a0)) = concat["R_Max<", tyToString a0, ">"]
409          | toString (R_Min(a0)) = concat["R_Min<", tyToString a0, ">"]
410          | toString (R_Sum(a0)) = concat["R_Sum<", tyToString a0, ">"]
411          | toString (R_Product(a0)) = concat["R_Product<", tyToString a0, ">"]
412          | toString (R_Mean(a0)) = concat["R_Mean<", tyToString a0, ">"]
413          | toString (R_Variance(a0)) = concat["R_Variance<", tyToString a0, ">"]
414        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]
415        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]        | toString (Transform(a0)) = concat["Transform<", ImageInfo.toString a0, ">"]
416        | toString (Translate(a0)) = concat["Translate<", ImageInfo.toString a0, ">"]        | toString (Translate(a0)) = concat["Translate<", ImageInfo.toString a0, ">"]
# Line 376  Line 423 
423        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]        | toString (LoadSeq(a0,a1)) = concat["LoadSeq<", tyToString a0, ",", stringToString a1, ">"]
424        | toString (LoadImage(a0,a1)) = concat["LoadImage<", tyToString a0, ",", stringToString a1, ">"]        | toString (LoadImage(a0,a1)) = concat["LoadImage<", tyToString a0, ",", stringToString a1, ">"]
425        | toString (Print(a0)) = concat["Print<", tysToString a0, ">"]        | toString (Print(a0)) = concat["Print<", tysToString a0, ">"]
426          | toString (MathFn(a0)) = concat["MathFn<", MathFns.toString a0, ">"]
427    
428    end    end
429    

Legend:
Removed from v.3508  
changed lines
  Added in v.3652

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