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
[diderot] / 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 4393, Tue Aug 9 22:00:05 2016 UTC revision 4394, Wed Aug 10 01:03:33 2016 UTC
# Line 80  Line 80 
80        | RoundToInt        | RoundToInt
81        | CeilToInt        | CeilToInt
82        | FloorToInt        | FloorToInt
83          | NumStrands of StrandSets.t
84        | Strands of ty * StrandSets.t        | Strands of ty * StrandSets.t
       | StrandStatus of ty * StrandSets.t  
85        | Kernel of Kernel.t * int        | Kernel of Kernel.t * int
86        | Inside of ImageInfo.info * int        | Inside of ImageInfo.info * int
87        | ImageDim of ImageInfo.info * int        | ImageDim of ImageInfo.info * int
# Line 132  Line 132 
132        | resultArity RoundToInt = 1        | resultArity RoundToInt = 1
133        | resultArity CeilToInt = 1        | resultArity CeilToInt = 1
134        | resultArity FloorToInt = 1        | resultArity FloorToInt = 1
135          | resultArity (NumStrands _) = 1
136        | resultArity (Strands _) = 1        | resultArity (Strands _) = 1
       | resultArity (StrandStatus _) = 1  
137        | resultArity (Kernel _) = 1        | resultArity (Kernel _) = 1
138        | resultArity (Inside _) = 1        | resultArity (Inside _) = 1
139        | resultArity (ImageDim _) = 1        | resultArity (ImageDim _) = 1
# Line 184  Line 184 
184        | arity RoundToInt = 1        | arity RoundToInt = 1
185        | arity CeilToInt = 1        | arity CeilToInt = 1
186        | arity FloorToInt = 1        | arity FloorToInt = 1
187          | arity (NumStrands _) = 0
188        | arity (Strands _) = 0        | arity (Strands _) = 0
       | arity (StrandStatus _) = 1  
189        | arity (Kernel _) = 0        | arity (Kernel _) = 0
190        | arity (Inside _) = 2        | arity (Inside _) = 2
191        | arity (ImageDim _) = 1        | arity (ImageDim _) = 1
# Line 243  Line 243 
243        | same (RoundToInt, RoundToInt) = true        | same (RoundToInt, RoundToInt) = true
244        | same (CeilToInt, CeilToInt) = true        | same (CeilToInt, CeilToInt) = true
245        | same (FloorToInt, FloorToInt) = true        | same (FloorToInt, FloorToInt) = true
246          | same (NumStrands(a0), NumStrands(b0)) = StrandSets.same(a0, b0)
247        | same (Strands(a0,a1), Strands(b0,b1)) = samety(a0, b0) andalso StrandSets.same(a1, b1)        | same (Strands(a0,a1), Strands(b0,b1)) = samety(a0, b0) andalso StrandSets.same(a1, b1)
       | same (StrandStatus(a0,a1), StrandStatus(b0,b1)) = samety(a0, b0) andalso StrandSets.same(a1, b1)  
248        | 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)
249        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (Inside(a0,a1), Inside(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
250        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)        | same (ImageDim(a0,a1), ImageDim(b0,b1)) = ImageInfo.same(a0, b0) andalso sameint(a1, b1)
# Line 296  Line 296 
296        | hash RoundToInt = 0w157        | hash RoundToInt = 0w157
297        | hash CeilToInt = 0w163        | hash CeilToInt = 0w163
298        | hash FloorToInt = 0w167        | hash FloorToInt = 0w167
299        | hash (Strands(a0,a1)) = 0w173 + hashty a0 + StrandSets.hash a1        | hash (NumStrands(a0)) = 0w173 + StrandSets.hash a0
300        | hash (StrandStatus(a0,a1)) = 0w179 + hashty a0 + StrandSets.hash a1        | hash (Strands(a0,a1)) = 0w179 + hashty a0 + StrandSets.hash a1
301        | hash (Kernel(a0,a1)) = 0w181 + Kernel.hash a0 + hashint a1        | hash (Kernel(a0,a1)) = 0w181 + Kernel.hash a0 + hashint a1
302        | hash (Inside(a0,a1)) = 0w191 + ImageInfo.hash a0 + hashint a1        | hash (Inside(a0,a1)) = 0w191 + ImageInfo.hash a0 + hashint a1
303        | hash (ImageDim(a0,a1)) = 0w193 + ImageInfo.hash a0 + hashint a1        | hash (ImageDim(a0,a1)) = 0w193 + ImageInfo.hash a0 + hashint a1
# Line 348  Line 348 
348        | toString RoundToInt = "RoundToInt"        | toString RoundToInt = "RoundToInt"
349        | toString CeilToInt = "CeilToInt"        | toString CeilToInt = "CeilToInt"
350        | toString FloorToInt = "FloorToInt"        | toString FloorToInt = "FloorToInt"
351          | toString (NumStrands(a0)) = concat["NumStrands<", StrandSets.toString a0, ">"]
352        | toString (Strands(a0,a1)) = concat["Strands<", tyToString a0, ",", StrandSets.toString a1, ">"]        | toString (Strands(a0,a1)) = concat["Strands<", tyToString a0, ",", StrandSets.toString a1, ">"]
       | toString (StrandStatus(a0,a1)) = concat["StrandStatus<", tyToString a0, ",", StrandSets.toString a1, ">"]  
353        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]        | toString (Kernel(a0,a1)) = concat["Kernel<", Kernel.toString a0, ",", intToString a1, ">"]
354        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (Inside(a0,a1)) = concat["Inside<", ImageInfo.toString a0, ",", intToString a1, ">"]
355        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]        | toString (ImageDim(a0,a1)) = concat["ImageDim<", ImageInfo.toString a0, ",", intToString a1, ">"]
Legend:
Removed from v.4393  
changed lines
  Added in v.4394
root@smlnj-gforge.cs.uchicago.edu
 ViewVC Help
Powered by ViewVC 1.0.0  
Powered By FusionForge