Merge pull request #138 from dpanfilyonok/fix

Fix generic to private space conversion
YaccConstructor · May 7, 2022 · b6bd6e9 · b6bd6e9
2 parents e154939 + a2874aa
commit b6bd6e9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/src/Brahma.FSharp.OpenCL.Translator/Body.fs b/src/Brahma.FSharp.OpenCL.Translator/Body.fs
@@ -126,7 +126,11 @@ module rec Body =
             | _ -> return! Type.translate var.Type
         }
 
-        return VarDecl(varType, newName, Some body)
+        let varDecl = VarDecl(varType, newName, Some body)
+        if varType :? RefType<Lang> then
+            varDecl.SpaceModifier <- Some AddressSpaceQualifier.Private
+
+        return varDecl
     }
 
     let private translateListOfArgs (args: Expr list) =
@@ -630,7 +634,6 @@ module rec Body =
         let! res = translate inExpr |> State.using clearContext
         let! sb = State.gets (fun context -> context.VarDecls)
 
-
         match res with
         | :? StatementBlock<Lang> as s -> sb.AddRange s.Statements
         | _ -> sb.Add(res :?> Statement<_>)

diff --git a/tests/Brahma.FSharp.Tests/ExecutionTests/CompilationTests.fs b/tests/Brahma.FSharp.Tests/ExecutionTests/CompilationTests.fs
@@ -26,6 +26,25 @@ module Helpers =
 
         Utils.filesAreEqual targetPath expectedPath
 
+let simpleTests context = [
+    let inline checkCode command outFile expected = checkCode context command outFile expected
+    testCase "Pointers to private values should be explicitly private" <| fun () ->
+        let command =
+            <@
+                fun (k: Range1D) (a: int clarray) ->
+                    let x (a: int) =
+                        a + 1
+
+                    let mutable s = 1
+                    let mutable s = 2
+                    let s1 = x s
+
+                    a.[0] <- s1
+            @>
+
+        checkCode command "GenericSpace.gen" "GenericSpace.cl"
+]
+
 type SimpleUnion =
     | SimpleOne
     | SimpleTwo of int
@@ -143,6 +162,7 @@ let unionTests context =
 
 let tests context =
     [
+        testList "Simple tests" << simpleTests
         testList "Union Compile tests" << unionTests
     ]
     |> List.map (fun testFixture -> testFixture context)

diff --git a/tests/Brahma.FSharp.Tests/ExecutionTests/Expected/GenericSpace.cl b/tests/Brahma.FSharp.Tests/ExecutionTests/Expected/GenericSpace.cl
@@ -0,0 +1,10 @@
+int x (private int a1)
+{return (a1 + 1) ;}
+int s1UnitFunc (private int * s2Ref)
+{return x (* (s2Ref)) ;}
+__kernel void brahmaKernel (__global int * a)
+{int s = 1 ;
+ int s2 = 2 ;
+ __private int * s2Ref = & s2 ;
+ int s1 = s1UnitFunc (s2Ref) ;
+ a [0] = s1 ;}