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 3582, Wed Jan 13 22:14:05 2016 UTC revision 3628, Sun Jan 31 14:30:06 2016 UTC
# 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
       | PrincipleEvec of ty  
72        | EigenVecs2x2        | EigenVecs2x2
73        | EigenVecs3x3        | EigenVecs3x3
74        | EigenVals2x2        | EigenVals2x2
# Line 131  Line 130 
130        | resultArity (Min _) = 1        | resultArity (Min _) = 1
131        | resultArity (Clamp _) = 1        | resultArity (Clamp _) = 1
132        | resultArity (Lerp _) = 1        | resultArity (Lerp _) = 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 193  Line 191 
191        | arity (Min _) = 2        | arity (Min _) = 2
192        | arity (Clamp _) = 3        | arity (Clamp _) = 3
193        | arity (Lerp _) = 3        | arity (Lerp _) = 3
       | 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 262  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 (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 325  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 (PrincipleEvec(a0)) = 0w71 + hashty a0        | hash EigenVecs2x2 = 0w71
325        | hash EigenVecs2x2 = 0w73        | hash EigenVecs3x3 = 0w73
326        | hash EigenVecs3x3 = 0w79        | hash EigenVals2x2 = 0w79
327        | hash EigenVals2x2 = 0w83        | hash EigenVals3x3 = 0w83
328        | hash EigenVals3x3 = 0w89        | hash (Zero(a0)) = 0w89 + hashty a0
329        | hash (Zero(a0)) = 0w97 + hashty a0        | hash (Select(a0,a1)) = 0w97 + hashty a0 + hashint a1
330        | hash (Select(a0,a1)) = 0w101 + hashty a0 + hashint a1        | hash (Index(a0,a1)) = 0w101 + hashty a0 + hashint a1
331        | hash (Index(a0,a1)) = 0w103 + hashty a0 + hashint a1        | hash (Subscript(a0)) = 0w103 + hashty a0
332        | hash (Subscript(a0)) = 0w107 + hashty a0        | hash (MkDynamic(a0,a1)) = 0w107 + hashty a0 + hashint a1
333        | hash (MkDynamic(a0,a1)) = 0w109 + hashty a0 + hashint a1        | hash (Append(a0)) = 0w109 + hashty a0
334        | hash (Append(a0)) = 0w113 + hashty a0        | hash (Prepend(a0)) = 0w113 + hashty a0
335        | hash (Prepend(a0)) = 0w127 + hashty a0        | hash (Concat(a0)) = 0w127 + hashty a0
336        | hash (Concat(a0)) = 0w131 + hashty a0        | hash Range = 0w131
337        | hash Range = 0w137        | hash (Length(a0)) = 0w137 + hashty a0
338        | hash (Length(a0)) = 0w139 + hashty a0        | hash (SphereQuery(a0,a1)) = 0w139 + hashty a0 + hashty a1
339        | hash (SphereQuery(a0,a1)) = 0w149 + hashty a0 + hashty a1        | 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 (R_All(a0)) = 0w181 + hashty a0        | hash (R_Exists(a0)) = 0w181 + hashty a0
347        | hash (R_Exists(a0)) = 0w191 + hashty a0        | hash (R_Max(a0)) = 0w191 + hashty a0
348        | hash (R_Max(a0)) = 0w193 + hashty a0        | hash (R_Min(a0)) = 0w193 + hashty a0
349        | hash (R_Min(a0)) = 0w197 + hashty a0        | hash (R_Sum(a0)) = 0w197 + hashty a0
350        | hash (R_Sum(a0)) = 0w199 + hashty a0        | hash (R_Product(a0)) = 0w199 + hashty a0
351        | hash (R_Product(a0)) = 0w211 + hashty a0        | hash (R_Mean(a0)) = 0w211 + hashty a0
352        | hash (R_Mean(a0)) = 0w223 + hashty a0        | hash (R_Variance(a0)) = 0w223 + hashty a0
353        | hash (R_Variance(a0)) = 0w227 + hashty a0        | hash (Kernel(a0,a1)) = 0w227 + Kernel.hash a0 + hashint a1
354        | hash (Kernel(a0,a1)) = 0w229 + Kernel.hash a0 + hashint a1        | hash (Transform(a0)) = 0w229 + ImageInfo.hash a0
355        | hash (Transform(a0)) = 0w233 + ImageInfo.hash a0        | hash (Translate(a0)) = 0w233 + ImageInfo.hash a0
356        | hash (Translate(a0)) = 0w239 + ImageInfo.hash a0        | hash (EvalKernel(a0,a1,a2)) = 0w239 + hashint a0 + Kernel.hash a1 + hashint a2
357        | hash (EvalKernel(a0,a1,a2)) = 0w241 + hashint a0 + Kernel.hash a1 + hashint a2        | hash (VoxelAddress(a0,a1)) = 0w241 + ImageInfo.hash a0 + hashint a1
358        | hash (VoxelAddress(a0,a1)) = 0w251 + ImageInfo.hash a0 + hashint a1        | hash (VoxelAddressWithCtl(a0,a1,a2)) = 0w251 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2
359        | hash (VoxelAddressWithCtl(a0,a1,a2)) = 0w257 + ImageInfo.hash a0 + hashint a1 + hashidxctl a2        | hash (LoadVoxels(a0,a1)) = 0w257 + ImageInfo.hash a0 + hashint a1
360        | hash (LoadVoxels(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1
361        | hash (Inside(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1        | hash (ImageDim(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1
362        | hash (ImageDim(a0,a1)) = 0w271 + ImageInfo.hash a0 + hashint a1        | hash (LoadSeq(a0,a1)) = 0w271 + hashty a0 + hashstring a1
363        | hash (LoadSeq(a0,a1)) = 0w277 + hashty a0 + hashstring a1        | hash (LoadImage(a0,a1)) = 0w277 + hashty a0 + hashstring a1
364        | hash (LoadImage(a0,a1)) = 0w281 + hashty a0 + hashstring a1        | hash (Print(a0)) = 0w281 + hashtys a0
365        | hash (Print(a0)) = 0w283 + hashtys a0        | hash (MathFn(a0)) = 0w283 + MathFns.hash a0
       | hash (MathFn(a0)) = 0w293 + MathFns.hash a0  
366    
367      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
368        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 387  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 (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"

Legend:
Removed from v.3582  
changed lines
  Added in v.3628

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