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

SCM Repository

[diderot] Diff of /branches/charisee/src/compiler/low-il/low-il.sml
ViewVC logotype

Diff of /branches/charisee/src/compiler/low-il/low-il.sml

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

revision 2837, Wed Nov 19 23:42:17 2014 UTC revision 2838, Tue Nov 25 03:40:24 2014 UTC
# Line 62  Line 62 
62        | Min        | Min
63        | Clamp of ty        | Clamp of ty
64        | Lerp of ty        | Lerp of ty
65          | Normalize of int
66        | PrincipleEvec of ty        | PrincipleEvec of ty
67        | EigenVecs2x2        | EigenVecs2x2
68        | EigenVecs3x3        | EigenVecs3x3
# Line 126  Line 127 
127        | resultArity Min = 1        | resultArity Min = 1
128        | resultArity (Clamp _) = 1        | resultArity (Clamp _) = 1
129        | resultArity (Lerp _) = 1        | resultArity (Lerp _) = 1
130          | resultArity (Normalize _) = 1
131        | resultArity (PrincipleEvec _) = 1        | resultArity (PrincipleEvec _) = 1
132        | resultArity EigenVecs2x2 = 1        | resultArity EigenVecs2x2 = 1
133        | resultArity EigenVecs3x3 = 1        | resultArity EigenVecs3x3 = 1
# Line 190  Line 192 
192        | arity Min = 2        | arity Min = 2
193        | arity (Clamp _) = 3        | arity (Clamp _) = 3
194        | arity (Lerp _) = 3        | arity (Lerp _) = 3
195          | arity (Normalize _) = 1
196        | arity (PrincipleEvec _) = 2        | arity (PrincipleEvec _) = 2
197        | arity EigenVecs2x2 = 1        | arity EigenVecs2x2 = 1
198        | arity EigenVecs3x3 = 1        | arity EigenVecs3x3 = 1
# Line 237  Line 240 
240        | same (IMul, IMul) = true        | same (IMul, IMul) = true
241        | same (IDiv, IDiv) = true        | same (IDiv, IDiv) = true
242        | same (INeg, INeg) = true        | same (INeg, INeg) = true
243        | same (IndexTensor(a0,a1,a2), IndexTensor(b0,b1,b2)) =  samety(a1, b1) andalso samety(a2, b2)        | same (IndexTensor(a0,a1,a2), IndexTensor(b0,b1,b2)) = sameint(a0, b0) andalso samety(a1, b1) andalso samety(a2, b2)
244        | same (ProjectTensor(a0,a1,a2,a3), ProjectTensor(b0,b1,b2,b3)) =  sameint(a1, b1) andalso samety(a2, b2) andalso samety(a3, b3)        | same (ProjectTensor(a0,a1,a2,a3), ProjectTensor(b0,b1,b2,b3)) = sameint(a0, b0) andalso sameint(a1, b1) andalso samety(a2, b2) andalso samety(a3, b3)
245        | same (addSca, addSca) = true        | same (addSca, addSca) = true
246        | same (subSca, subSca) = true        | same (subSca, subSca) = true
247        | same (prodSca, prodSca) = true        | same (prodSca, prodSca) = true
# Line 261  Line 264 
264        | same (Min, Min) = true        | same (Min, Min) = true
265        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)        | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)
266        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)        | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)
267          | same (Normalize(a0), Normalize(b0)) = sameint(a0, b0)
268        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)        | same (PrincipleEvec(a0), PrincipleEvec(b0)) = samety(a0, b0)
269        | same (EigenVecs2x2, EigenVecs2x2) = true        | same (EigenVecs2x2, EigenVecs2x2) = true
270        | same (EigenVecs3x3, EigenVecs3x3) = true        | same (EigenVecs3x3, EigenVecs3x3) = true
# Line 302  Line 306 
306        | hash IMul = 0w7        | hash IMul = 0w7
307        | hash IDiv = 0w11        | hash IDiv = 0w11
308        | hash INeg = 0w13        | hash INeg = 0w13
309        | hash (IndexTensor(a0,a1,a2)) = 0w17 + hashty a1 + hashty a2        | hash (IndexTensor(a0,a1,a2)) = 0w17 + hashint a0 + hashty a1 + hashty a2
310        | hash (ProjectTensor(a0,a1,a2,a3)) = 0w19 + hashint a0 + hashint a1 + hashty a2 + hashty a3        | hash (ProjectTensor(a0,a1,a2,a3)) = 0w19 + hashint a0 + hashint a1 + hashty a2 + hashty a3
311        | hash addSca = 0w23        | hash addSca = 0w23
312        | hash subSca = 0w29        | hash subSca = 0w29
# Line 326  Line 330 
330        | hash Min = 0w107        | hash Min = 0w107
331        | hash (Clamp(a0)) = 0w109 + hashty a0        | hash (Clamp(a0)) = 0w109 + hashty a0
332        | hash (Lerp(a0)) = 0w113 + hashty a0        | hash (Lerp(a0)) = 0w113 + hashty a0
333        | hash (PrincipleEvec(a0)) = 0w127 + hashty a0        | hash (Normalize(a0)) = 0w127 + hashint a0
334        | hash EigenVecs2x2 = 0w131        | hash (PrincipleEvec(a0)) = 0w131 + hashty a0
335        | hash EigenVecs3x3 = 0w137        | hash EigenVecs2x2 = 0w137
336        | hash EigenVals2x2 = 0w139        | hash EigenVecs3x3 = 0w139
337        | hash EigenVals3x3 = 0w149        | hash EigenVals2x2 = 0w149
338        | hash (Zero(a0)) = 0w151 + hashty a0        | hash EigenVals3x3 = 0w151
339        | hash (Select(a0,a1)) = 0w157 + hashty a0 + hashint a1        | hash (Zero(a0)) = 0w157 + hashty a0
340        | hash (Index(a0,a1)) = 0w163 + hashty a0 + hashint a1        | hash (Select(a0,a1)) = 0w163 + hashty a0 + hashint a1
341        | hash (Subscript(a0)) = 0w167 + hashty a0        | hash (Index(a0,a1)) = 0w167 + hashty a0 + hashint a1
342        | hash (MkDynamic(a0,a1)) = 0w173 + hashty a0 + hashint a1        | hash (Subscript(a0)) = 0w173 + hashty a0
343        | hash (Append(a0)) = 0w179 + hashty a0        | hash (MkDynamic(a0,a1)) = 0w179 + hashty a0 + hashint a1
344        | hash (Prepend(a0)) = 0w181 + hashty a0        | hash (Append(a0)) = 0w181 + hashty a0
345        | hash (Concat(a0)) = 0w191 + hashty a0        | hash (Prepend(a0)) = 0w191 + hashty a0
346        | hash Sqrt = 0w193        | hash (Concat(a0)) = 0w193 + hashty a0
347        | hash (Ceiling(a0)) = 0w197 + hashint a0        | hash Sqrt = 0w197
348        | hash (Floor(a0)) = 0w199 + hashint a0        | hash (Ceiling(a0)) = 0w199 + hashint a0
349        | hash (Round(a0)) = 0w211 + hashint a0        | hash (Floor(a0)) = 0w211 + hashint a0
350        | hash (Trunc(a0)) = 0w223 + hashint a0        | hash (Round(a0)) = 0w223 + hashint a0
351        | hash IntToReal = 0w227        | hash (Trunc(a0)) = 0w227 + hashint a0
352        | hash (RealToInt(a0)) = 0w229 + hashint a0        | hash IntToReal = 0w229
353        | hash (Transform(a0)) = 0w233 + ImageInfo.hash a0        | hash (RealToInt(a0)) = 0w233 + hashint a0
354        | hash (Translate(a0)) = 0w239 + ImageInfo.hash a0        | hash (Transform(a0)) = 0w239 + ImageInfo.hash a0
355        | hash (Kernel(a0,a1)) = 0w241 + Kernel.hash a0 + hashint a1        | hash (Translate(a0)) = 0w241 + ImageInfo.hash a0
356        | hash (ImageAddress(a0)) = 0w251 + ImageInfo.hash a0        | hash (Kernel(a0,a1)) = 0w251 + Kernel.hash a0 + hashint a1
357        | hash (LoadVoxels(a0,a1)) = 0w257 + ImageInfo.hash a0 + hashint a1        | hash (ImageAddress(a0)) = 0w257 + ImageInfo.hash a0
358        | hash (Inside(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1        | hash (LoadVoxels(a0,a1)) = 0w263 + ImageInfo.hash a0 + hashint a1
359        | hash (LoadSeq(a0,a1)) = 0w269 + hashty a0 + hashstring a1        | hash (Inside(a0,a1)) = 0w269 + ImageInfo.hash a0 + hashint a1
360        | hash (LoadImage(a0)) = 0w271 + ImageInfo.hash a0        | hash (LoadSeq(a0,a1)) = 0w271 + hashty a0 + hashstring a1
361        | hash (imgAddr(a0,a1,a2)) = 0w277 + ImageInfo.hash a0 + hashty a1 + hashint a2        | hash (LoadImage(a0)) = 0w277 + ImageInfo.hash a0
362        | hash (imgLoad(a0,a1,a2)) = 0w281 + ImageInfo.hash a0 + hashint a1 + hashint a2        | hash (imgAddr(a0,a1,a2)) = 0w281 + ImageInfo.hash a0 + hashty a1 + hashint a2
363        | hash (baseAddr(a0)) = 0w283 + ImageInfo.hash a0        | hash (imgLoad(a0,a1,a2)) = 0w283 + ImageInfo.hash a0 + hashint a1 + hashint a2
364        | hash (Input(a0,a1,a2)) = 0w293 + hashty a0 + hashstring a1 + hashstring a2        | hash (baseAddr(a0)) = 0w293 + ImageInfo.hash a0
365        | hash (InputWithDefault(a0,a1,a2)) = 0w307 + hashty a0 + hashstring a1 + hashstring a2        | hash (Input(a0,a1,a2)) = 0w307 + hashty a0 + hashstring a1 + hashstring a2
366        | hash (Print(a0)) = 0w311 + hashtys a0        | hash (InputWithDefault(a0,a1,a2)) = 0w311 + hashty a0 + hashstring a1 + hashstring a2
367          | hash (Print(a0)) = 0w313 + hashtys a0
368    
369      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
370        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 390  Line 395 
395        | toString Min = "Min"        | toString Min = "Min"
396        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]        | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]
397        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]        | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]
398          | toString (Normalize(a0)) = concat["Normalize<", intToString a0, ">"]
399        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]        | toString (PrincipleEvec(a0)) = concat["PrincipleEvec<", tyToString a0, ">"]
400        | toString EigenVecs2x2 = "EigenVecs2x2"        | toString EigenVecs2x2 = "EigenVecs2x2"
401        | toString EigenVecs3x3 = "EigenVecs3x3"        | toString EigenVecs3x3 = "EigenVecs3x3"

Legend:
Removed from v.2837  
changed lines
  Added in v.2838

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