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 3797, Mon May 2 21:10:12 2016 UTC revision 3830, Thu May 5 22:13:46 2016 UTC
# Line 65  Line 65 
65        | Max of ty        | Max of ty
66        | Min of ty        | Min of ty
67        | Clamp of ty        | Clamp of ty
68          | MapClamp of ty
69        | Lerp of ty        | Lerp of ty
70        | TensorIndex of ty * shape        | TensorIndex of ty * shape
71        | EigenVecs2x2        | EigenVecs2x2
# Line 130  Line 131 
131        | resultArity (Max _) = 1        | resultArity (Max _) = 1
132        | resultArity (Min _) = 1        | resultArity (Min _) = 1
133        | resultArity (Clamp _) = 1        | resultArity (Clamp _) = 1
134          | resultArity (MapClamp _) = 1
135        | resultArity (Lerp _) = 1        | resultArity (Lerp _) = 1
136        | resultArity (TensorIndex _) = 1        | resultArity (TensorIndex _) = 1
137        | resultArity EigenVecs2x2 = 1        | resultArity EigenVecs2x2 = 1
# Line 195  Line 197 
197        | arity (Max _) = 2        | arity (Max _) = 2
198        | arity (Min _) = 2        | arity (Min _) = 2
199        | arity (Clamp _) = 3        | arity (Clamp _) = 3
200          | arity (MapClamp _) = 3
201        | arity (Lerp _) = 3        | arity (Lerp _) = 3
202        | arity (TensorIndex _) = 1        | arity (TensorIndex _) = 1
203        | arity EigenVecs2x2 = 1        | arity EigenVecs2x2 = 1
# Line 267  Line 270 
270        | same (Max(a0), Max(b0)) = samety(a0, b0)        | same (Max(a0), Max(b0)) = samety(a0, b0)
271        | same (Min(a0), Min(b0)) = samety(a0, b0)        | same (Min(a0), Min(b0)) = samety(a0, b0)
272        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)
273          | same (MapClamp(a0), MapClamp(b0)) = samety(a0, b0)
274        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)
275        | same (TensorIndex(a0,a1), TensorIndex(b0,b1)) = samety(a0, b0) andalso sameshape(a1, b1)        | same (TensorIndex(a0,a1), TensorIndex(b0,b1)) = samety(a0, b0) andalso sameshape(a1, b1)
276        | same (EigenVecs2x2, EigenVecs2x2) = true        | same (EigenVecs2x2, EigenVecs2x2) = true
# Line 333  Line 337 
337        | hash (Max(a0)) = 0w53 + hashty a0        | hash (Max(a0)) = 0w53 + hashty a0
338        | hash (Min(a0)) = 0w59 + hashty a0        | hash (Min(a0)) = 0w59 + hashty a0
339        | hash (Clamp(a0)) = 0w61 + hashty a0        | hash (Clamp(a0)) = 0w61 + hashty a0
340        | hash (Lerp(a0)) = 0w67 + hashty a0        | hash (MapClamp(a0)) = 0w67 + hashty a0
341        | hash (TensorIndex(a0,a1)) = 0w71 + hashty a0 + hashshape a1        | hash (Lerp(a0)) = 0w71 + hashty a0
342        | hash EigenVecs2x2 = 0w73        | hash (TensorIndex(a0,a1)) = 0w73 + hashty a0 + hashshape a1
343        | hash EigenVecs3x3 = 0w79        | hash EigenVecs2x2 = 0w79
344        | hash EigenVals2x2 = 0w83        | hash EigenVecs3x3 = 0w83
345        | hash EigenVals3x3 = 0w89        | hash EigenVals2x2 = 0w89
346        | hash (Zero(a0)) = 0w97 + hashty a0        | hash EigenVals3x3 = 0w97
347        | hash (Select(a0,a1)) = 0w101 + hashty a0 + hashint a1        | hash (Zero(a0)) = 0w101 + hashty a0
348        | hash (Subscript(a0)) = 0w103 + hashty a0        | hash (Select(a0,a1)) = 0w103 + hashty a0 + hashint a1
349        | hash (MkDynamic(a0,a1)) = 0w107 + hashty a0 + hashint a1        | hash (Subscript(a0)) = 0w107 + hashty a0
350        | hash (Append(a0)) = 0w109 + hashty a0        | hash (MkDynamic(a0,a1)) = 0w109 + hashty a0 + hashint a1
351        | hash (Prepend(a0)) = 0w113 + hashty a0        | hash (Append(a0)) = 0w113 + hashty a0
352        | hash (Concat(a0)) = 0w127 + hashty a0        | hash (Prepend(a0)) = 0w127 + hashty a0
353        | hash Range = 0w131        | hash (Concat(a0)) = 0w131 + hashty a0
354        | hash (Length(a0)) = 0w137 + hashty a0        | hash Range = 0w137
355        | hash (SphereQuery(a0,a1)) = 0w139 + hashty a0 + hashty a1        | hash (Length(a0)) = 0w139 + hashty a0
356        | hash (Ceiling(a0)) = 0w149 + hashint a0        | hash (SphereQuery(a0,a1)) = 0w149 + hashty a0 + hashty a1
357        | hash (Floor(a0)) = 0w151 + hashint a0        | hash (Ceiling(a0)) = 0w151 + hashint a0
358        | hash (Round(a0)) = 0w157 + hashint a0        | hash (Floor(a0)) = 0w157 + hashint a0
359        | hash (Trunc(a0)) = 0w163 + hashint a0        | hash (Round(a0)) = 0w163 + hashint a0
360        | hash IntToReal = 0w167        | hash (Trunc(a0)) = 0w167 + hashint a0
361        | hash (RealToInt(a0)) = 0w173 + hashint a0        | hash IntToReal = 0w173
362        | hash (R_All(a0)) = 0w179 + hashty a0        | hash (RealToInt(a0)) = 0w179 + hashint a0
363        | hash (R_Exists(a0)) = 0w181 + hashty a0        | hash (R_All(a0)) = 0w181 + hashty a0
364        | hash (R_Max(a0)) = 0w191 + hashty a0        | hash (R_Exists(a0)) = 0w191 + hashty a0
365        | hash (R_Min(a0)) = 0w193 + hashty a0        | hash (R_Max(a0)) = 0w193 + hashty a0
366        | hash (R_Sum(a0)) = 0w197 + hashty a0        | hash (R_Min(a0)) = 0w197 + hashty a0
367        | hash (R_Product(a0)) = 0w199 + hashty a0        | hash (R_Sum(a0)) = 0w199 + hashty a0
368        | hash (R_Mean(a0)) = 0w211 + hashty a0        | hash (R_Product(a0)) = 0w211 + hashty a0
369        | hash (R_Variance(a0)) = 0w223 + hashty a0        | hash (R_Mean(a0)) = 0w223 + hashty a0
370        | hash (BuildPos(a0)) = 0w227 + hashint a0        | hash (R_Variance(a0)) = 0w227 + hashty a0
371        | hash (EvalKernel(a0,a1,a2)) = 0w229 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (BuildPos(a0)) = 0w229 + hashint a0
372        | hash (Kernel(a0,a1)) = 0w233 + Kernel.hash a0 + hashint a1        | hash (EvalKernel(a0,a1,a2)) = 0w233 + hashint a0 + Kernel.hash a1 + hashint a2
373        | hash (Transform(a0)) = 0w239 + ImageInfo.hash a0        | hash (Kernel(a0,a1)) = 0w239 + Kernel.hash a0 + hashint a1
374        | hash (Translate(a0)) = 0w241 + ImageInfo.hash a0        | hash (Transform(a0)) = 0w241 + ImageInfo.hash a0
375        | hash (LoadVoxels(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1        | hash (Translate(a0)) = 0w251 + ImageInfo.hash a0
376        | hash (LoadVoxelsWithCtl(a0,a1,a2)) = 0w257 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2        | hash (LoadVoxels(a0,a1)) = 0w257 + ImageInfo.hash a0 + hashint a1
377        | hash (Inside(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxelsWithCtl(a0,a1,a2)) = 0w263 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2
378        | hash (ImageDim(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1
379        | hash (BorderCtlDefault(a0)) = 0w271 + ImageInfo.hash a0        | hash (ImageDim(a0,a1)) = 0w271 + ImageInfo.hash a0 + hashint a1
380        | hash (BorderCtlClamp(a0)) = 0w277 + ImageInfo.hash a0        | hash (BorderCtlDefault(a0)) = 0w277 + ImageInfo.hash a0
381        | hash (BorderCtlMirror(a0)) = 0w281 + ImageInfo.hash a0        | hash (BorderCtlClamp(a0)) = 0w281 + ImageInfo.hash a0
382        | hash (BorderCtlWrap(a0)) = 0w283 + ImageInfo.hash a0        | hash (BorderCtlMirror(a0)) = 0w283 + ImageInfo.hash a0
383        | hash (LoadSeq(a0,a1)) = 0w293 + hashty a0 + hashstring a1        | hash (BorderCtlWrap(a0)) = 0w293 + ImageInfo.hash a0
384        | hash (LoadImage(a0,a1)) = 0w307 + hashty a0 + hashstring a1        | hash (LoadSeq(a0,a1)) = 0w307 + hashty a0 + hashstring a1
385        | hash (Print(a0)) = 0w311 + hashtys a0        | hash (LoadImage(a0,a1)) = 0w311 + hashty a0 + hashstring a1
386        | hash (MathFn(a0)) = 0w313 + MathFns.hash a0        | hash (Print(a0)) = 0w313 + hashtys a0
387          | hash (MathFn(a0)) = 0w317 + MathFns.hash a0
388    
389      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
390        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 398  Line 403 
403        | toString (Max(a0)) = concat["Max<", tyToString a0, ">"]        | toString (Max(a0)) = concat["Max<", tyToString a0, ">"]
404        | toString (Min(a0)) = concat["Min<", tyToString a0, ">"]        | toString (Min(a0)) = concat["Min<", tyToString a0, ">"]
405        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]
406          | toString (MapClamp(a0)) = concat["MapClamp<", tyToString a0, ">"]
407        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]
408        | toString (TensorIndex(a0,a1)) = concat["TensorIndex<", tyToString a0, ",", shapeToString a1, ">"]        | toString (TensorIndex(a0,a1)) = concat["TensorIndex<", tyToString a0, ",", shapeToString a1, ">"]
409        | toString EigenVecs2x2 = "EigenVecs2x2"        | toString EigenVecs2x2 = "EigenVecs2x2"

Legend:
Removed from v.3797  
changed lines
  Added in v.3830

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