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

SCM Repository

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

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

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

revision 5240, Mon Jul 31 17:08:24 2017 UTC revision 5241, Tue Aug 1 04:33:46 2017 UTC
# Line 61  Line 61 
61        | Abs of ty        | Abs of ty
62        | Max of ty        | Max of ty
63        | Min of ty        | Min of ty
       | Clamp of ty  
       | MapClamp of ty  
       | Lerp of ty  
64        | Eigen2x2        | Eigen2x2
65        | Eigen3x3        | Eigen3x3
66        | Zero of ty        | Zero of ty
# Line 117  Line 114 
114        | resultArity (Abs _) = 1        | resultArity (Abs _) = 1
115        | resultArity (Max _) = 1        | resultArity (Max _) = 1
116        | resultArity (Min _) = 1        | resultArity (Min _) = 1
       | resultArity (Clamp _) = 1  
       | resultArity (MapClamp _) = 1  
       | resultArity (Lerp _) = 1  
117        | resultArity Eigen2x2 = 2        | resultArity Eigen2x2 = 2
118        | resultArity Eigen3x3 = 2        | resultArity Eigen3x3 = 2
119        | resultArity (Zero _) = 1        | resultArity (Zero _) = 1
# Line 173  Line 167 
167        | arity (Abs _) = 1        | arity (Abs _) = 1
168        | arity (Max _) = 2        | arity (Max _) = 2
169        | arity (Min _) = 2        | arity (Min _) = 2
       | arity (Clamp _) = 3  
       | arity (MapClamp _) = 3  
       | arity (Lerp _) = 3  
170        | arity Eigen2x2 = 1        | arity Eigen2x2 = 1
171        | arity Eigen3x3 = 1        | arity Eigen3x3 = 1
172        | arity (Zero _) = 0        | arity (Zero _) = 0
# Line 238  Line 229 
229        | same (Abs(a0), Abs(b0)) = samety(a0, b0)        | same (Abs(a0), Abs(b0)) = samety(a0, b0)
230        | same (Max(a0), Max(b0)) = samety(a0, b0)        | same (Max(a0), Max(b0)) = samety(a0, b0)
231        | same (Min(a0), Min(b0)) = samety(a0, b0)        | same (Min(a0), Min(b0)) = samety(a0, b0)
       | same (Clamp(a0), Clamp(b0)) = samety(a0, b0)  
       | same (MapClamp(a0), MapClamp(b0)) = samety(a0, b0)  
       | same (Lerp(a0), Lerp(b0)) = samety(a0, b0)  
232        | same (Eigen2x2, Eigen2x2) = true        | same (Eigen2x2, Eigen2x2) = true
233        | same (Eigen3x3, Eigen3x3) = true        | same (Eigen3x3, Eigen3x3) = true
234        | same (Zero(a0), Zero(b0)) = samety(a0, b0)        | same (Zero(a0), Zero(b0)) = samety(a0, b0)
# Line 295  Line 283 
283        | hash (Abs(a0)) = 0w61 + hashty a0        | hash (Abs(a0)) = 0w61 + hashty a0
284        | hash (Max(a0)) = 0w67 + hashty a0        | hash (Max(a0)) = 0w67 + hashty a0
285        | hash (Min(a0)) = 0w71 + hashty a0        | hash (Min(a0)) = 0w71 + hashty a0
286        | hash (Clamp(a0)) = 0w73 + hashty a0        | hash Eigen2x2 = 0w73
287        | hash (MapClamp(a0)) = 0w79 + hashty a0        | hash Eigen3x3 = 0w79
288        | hash (Lerp(a0)) = 0w83 + hashty a0        | hash (Zero(a0)) = 0w83 + hashty a0
289        | hash Eigen2x2 = 0w89        | hash (TensorIndex(a0,a1)) = 0w89 + hashty a0 + hashshape a1
290        | hash Eigen3x3 = 0w97        | hash (Select(a0,a1)) = 0w97 + hashty a0 + hashint a1
291        | hash (Zero(a0)) = 0w101 + hashty a0        | hash (Subscript(a0)) = 0w101 + hashty a0
292        | hash (TensorIndex(a0,a1)) = 0w103 + hashty a0 + hashshape a1        | hash (MkDynamic(a0,a1)) = 0w103 + hashty a0 + hashint a1
293        | hash (Select(a0,a1)) = 0w107 + hashty a0 + hashint a1        | hash (Append(a0)) = 0w107 + hashty a0
294        | hash (Subscript(a0)) = 0w109 + hashty a0        | hash (Prepend(a0)) = 0w109 + hashty a0
295        | hash (MkDynamic(a0,a1)) = 0w113 + hashty a0 + hashint a1        | hash (Concat(a0)) = 0w113 + hashty a0
296        | hash (Append(a0)) = 0w127 + hashty a0        | hash Range = 0w127
297        | hash (Prepend(a0)) = 0w131 + hashty a0        | hash (Length(a0)) = 0w131 + hashty a0
298        | hash (Concat(a0)) = 0w137 + hashty a0        | hash (SphereQuery(a0,a1)) = 0w137 + hashint a0 + hashty a1
299        | hash Range = 0w139        | hash IntToReal = 0w139
300        | hash (Length(a0)) = 0w149 + hashty a0        | hash TruncToInt = 0w149
301        | hash (SphereQuery(a0,a1)) = 0w151 + hashint a0 + hashty a1        | hash RoundToInt = 0w151
302        | hash IntToReal = 0w157        | hash CeilToInt = 0w157
303        | hash TruncToInt = 0w163        | hash FloorToInt = 0w163
304        | hash RoundToInt = 0w167        | hash (NumStrands(a0)) = 0w167 + StrandSets.hash a0
305        | hash CeilToInt = 0w173        | hash (Strands(a0,a1)) = 0w173 + hashty a0 + StrandSets.hash a1
306        | hash FloorToInt = 0w179        | hash (Kernel(a0,a1)) = 0w179 + Kernel.hash a0 + hashint a1
307        | hash (NumStrands(a0)) = 0w181 + StrandSets.hash a0        | hash (Inside(a0,a1)) = 0w181 + ImageInfo.hash a0 + hashint a1
308        | hash (Strands(a0,a1)) = 0w191 + hashty a0 + StrandSets.hash a1        | hash (ImageDim(a0,a1)) = 0w191 + ImageInfo.hash a0 + hashint a1
309        | hash (Kernel(a0,a1)) = 0w193 + Kernel.hash a0 + hashint a1        | hash (BorderCtlDefault(a0)) = 0w193 + ImageInfo.hash a0
310        | hash (Inside(a0,a1)) = 0w197 + ImageInfo.hash a0 + hashint a1        | hash (BorderCtlClamp(a0)) = 0w197 + ImageInfo.hash a0
311        | hash (ImageDim(a0,a1)) = 0w199 + ImageInfo.hash a0 + hashint a1        | hash (BorderCtlMirror(a0)) = 0w199 + ImageInfo.hash a0
312        | hash (BorderCtlDefault(a0)) = 0w211 + ImageInfo.hash a0        | hash (BorderCtlWrap(a0)) = 0w211 + ImageInfo.hash a0
313        | hash (BorderCtlClamp(a0)) = 0w223 + ImageInfo.hash a0        | hash (LoadSeq(a0,a1)) = 0w223 + hashty a0 + hashstring a1
314        | hash (BorderCtlMirror(a0)) = 0w227 + ImageInfo.hash a0        | hash (LoadImage(a0,a1)) = 0w227 + hashty a0 + hashstring a1
315        | hash (BorderCtlWrap(a0)) = 0w229 + ImageInfo.hash a0        | hash KillAll = 0w229
316        | hash (LoadSeq(a0,a1)) = 0w233 + hashty a0 + hashstring a1        | hash StabilizeAll = 0w233
317        | hash (LoadImage(a0,a1)) = 0w239 + hashty a0 + hashstring a1        | hash (Print(a0)) = 0w239 + hashtys a0
318        | hash KillAll = 0w241        | hash (MathFn(a0)) = 0w241 + MathFns.hash a0
       | hash StabilizeAll = 0w251  
       | hash (Print(a0)) = 0w257 + hashtys a0  
       | hash (MathFn(a0)) = 0w263 + MathFns.hash a0  
319    
320      fun toString IAdd = "IAdd"      fun toString IAdd = "IAdd"
321        | toString ISub = "ISub"        | toString ISub = "ISub"
# Line 351  Line 336 
336        | toString (Abs(a0)) = concat["Abs<", tyToString a0, ">"]        | toString (Abs(a0)) = concat["Abs<", tyToString a0, ">"]
337        | toString (Max(a0)) = concat["Max<", tyToString a0, ">"]        | toString (Max(a0)) = concat["Max<", tyToString a0, ">"]
338        | toString (Min(a0)) = concat["Min<", tyToString a0, ">"]        | toString (Min(a0)) = concat["Min<", tyToString a0, ">"]
       | toString (Clamp(a0)) = concat["Clamp<", tyToString a0, ">"]  
       | toString (MapClamp(a0)) = concat["MapClamp<", tyToString a0, ">"]  
       | toString (Lerp(a0)) = concat["Lerp<", tyToString a0, ">"]  
339        | toString Eigen2x2 = "Eigen2x2"        | toString Eigen2x2 = "Eigen2x2"
340        | toString Eigen3x3 = "Eigen3x3"        | toString Eigen3x3 = "Eigen3x3"
341        | toString (Zero(a0)) = concat["Zero<", tyToString a0, ">"]        | toString (Zero(a0)) = concat["Zero<", tyToString a0, ">"]

Legend:
Removed from v.5240  
changed lines
  Added in v.5241

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