Kernel experimentation and DiffEqu creation

Author: sami-hatna66

include/Actor.cpp

@@ -1,6 +1,7 @@
 #include "Actor.hpp"
 #include <iostream>
 #include <array>
+#include <sycl/sycl.hpp>
 
 Actor::Actor(std::array<float, 2> pPos, std::array<float, 2> pVelocity, std::array<float, 2> pDesiredVelocity, std::array<float, 2> pDestination, float pMass, float pRadius) {
     pos = pPos;
@@ -15,7 +16,7 @@ std::array<float, 2> Actor::getPos() {
     return pos;
 }
 
-std::array<float, 2> Actor::getVelocity() {
+SYCL_EXTERNAL std::array<float, 2> Actor::getVelocity() {
     return velocity;
 }
 

include/Actor.hpp

@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <array>
+#include <sycl/sycl.hpp>
 
 class Actor {
 private:
@@ -15,14 +16,14 @@ class Actor {
 public:    
     Actor(std::array<float, 2> pPos, std::array<float, 2> pVelocity, std::array<float, 2> pDesiredVelocity, std::array<float, 2> pDestination, float pMass, float pRadius);
 
-    std::array<float, 2> getPos();
-    std::array<float, 2> getVelocity();
+    SYCL_EXTERNAL std::array<float, 2> getPos();
+    SYCL_EXTERNAL std::array<float, 2> getVelocity();
     std::array<float, 2> getDesiredVelocity();
     std::array<float, 2> getDestination();
     float getMass();
     float getRadius();
 
-    void setPos(std::array<float, 2> newPos);
+    SYCL_EXTERNAL void setPos(std::array<float, 2> newPos);
     void setVelocity(std::array<float, 2> newVelocity);
     void setDesiredVelocity(std::array<float, 2> newDesiredVelocity);
     void setDestination(std::array<float, 2> newDestination);

include/CMakeLists.txt

@@ -1 +1 @@
-add_library(include Actor.cpp Room.cpp MathHelper.cpp)
+add_library(include Actor.cpp Room.cpp MathHelper.cpp DifferentialEq.cpp)

include/DifferentialEq.cpp

@@ -0,0 +1,9 @@
+#include <iostream>
+#include <vector>
+#include <array>
+#include "DifferentialEq.hpp"
+#include "Actor.hpp"
+#include "Room.hpp"
+#include "MathHelper.hpp"
+
+void DifferentialEqu(Actor actor);

include/DifferentialEq.hpp

@@ -0,0 +1,19 @@
+#ifndef DifferentialEqu_hpp
+#define DifferentialEqu_hpp
+
+#include <iostream>
+#include <vector>
+#include <array>
+#include "Actor.hpp"
+#include "Room.hpp"
+#include "MathHelper.hpp"
+
+const float Ai = 2000;
+const float Bi = 0.08;
+const float k1 = 125000;
+const float k2 = 240000;
+const float ti = 0.5;
+
+void DifferentialEqu(Actor actor);
+
+#endif

src/main.cpp

@@ -1,10 +1,11 @@
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <SDL2/SDL.h>
 #include <iostream>
 
 #include "Actor.hpp"
 #include "Room.hpp"
 #include "MathHelper.hpp"
+#include "DifferentialEq.hpp"
 
 const int WIDTH = 8; // metres
 const int HEIGHT = 6; // metres
@@ -34,10 +35,19 @@ void drawCircle(SDL_Renderer* &render, SDL_Point center, int radius, SDL_Color c
 }
 
 void update(std::vector<Actor> &actors) {
-    for (auto &actor : actors) {
-        actor.setPos({actor.getPos()[0] + actor.getVelocity()[0],
-                      actor.getPos()[1] + actor.getVelocity()[1]});
-    }
+    sycl::queue myQueue{sycl::gpu_selector()};
+
+    auto actorBuf = sycl::buffer<Actor>(actors.data(), actors.size());
+
+    myQueue.submit([&](sycl::handler& cgh) {
+        auto actorAcc = actorBuf.get_access<sycl::access::mode::read_write>(cgh);
+
+        cgh.parallel_for(sycl::range<1>{actors.size()}, [=](sycl::id<1> index) {
+            Actor current = actorAcc[index];
+            actorAcc[index].setPos({current.getPos()[0] + current.getVelocity()[0],
+                            current.getPos()[1] + current.getVelocity()[1]});
+        }); 
+    }).wait();
 }
 
 void draw(SDL_Renderer* &render, std::vector<Actor> actors, Room room) {
@@ -55,9 +65,6 @@ void draw(SDL_Renderer* &render, std::vector<Actor> actors, Room room) {
         SDL_RenderDrawLine(render, wall[0] * SCALE, wall[1] * SCALE, wall[2] * SCALE, wall[3] * SCALE);
     }
 
-    SDL_SetRenderDrawColor(render, 0, 255, 0, 255);
-    SDL_RenderDrawPoint(render, 100, 200);
-
     SDL_RenderPresent(render);
 }
 
@@ -77,7 +84,7 @@ int main() {
     init(win, render, actors);
 
     // Make actor move towards destination
-    actors[0].setVelocity(velToPoint(0.01, actors[0].getPos(), actors[0].getDestination()));
+    actors[0].setVelocity(velToPoint(0.008, actors[0].getPos(), actors[0].getDestination()));
 
     draw(render, actors, room);