Compile for spir-gen

Author: sami-hatna66

CMakeLists.txt

@@ -12,7 +12,7 @@ find_package(SDL2 REQUIRED)
 include_directories(${SDL2_INCLUDE_DIRS})
 
 add_executable(crowdsim src/main.cpp)
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fsycl")
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fsycl -fsycl-targets=spir64-gen")
 
 add_subdirectory(external)
 

external/Actor.cpp

@@ -95,6 +95,6 @@ SYCL_EXTERNAL void Actor::checkAtDestination(vecType destination, int pathSize)
 void Actor::refreshVariation() {
     std::random_device rd;
     std::mt19937 gen(rd());
-    std::normal_distribution<float> distr{0.0f, 1.0f};
+    std::normal_distribution<float> distr{0.0f, 2.0f};
     this->setVariation({distr(gen), distr(gen)});
 }

external/DifferentialEq.cpp

@@ -5,16 +5,16 @@ SYCL_EXTERNAL void differentialEq(int currentIndex, sycl::accessor<Actor, 1, syc
 
     vecType pos = currentActor->getPos();
 
+    // Calculate personal impulse
     float mi = currentActor->getMass();
     float v0i = currentActor->getDesiredSpeed();
     vecType destination = paths[currentActor->getPathId()].getCheckpoints()[currentActor->getDestinationIndex()];
     vecType e0i = normalize(getDirectionVector(currentActor->getPos(), destination));
     vecType vi = currentActor->getVelocity();
 
     vecType personalImpulse = mi * (((v0i * e0i) - vi) / Ti);
-
-    out << pos[0] << ", " << pos[1] << "   ->   " << destination[0] << ", " << destination[1] << sycl::endl;
 
+    // Calculate forces applied by neighbouring actors
     vecType peopleForces = {0, 0};
     for (int x = 0; x < actors.size(); x++) {
         Actor neighbour = actors[x];
@@ -31,6 +31,7 @@ SYCL_EXTERNAL void differentialEq(int currentIndex, sycl::accessor<Actor, 1, syc
         }
     }
 
+    // Calculate forces applied by walls
     vecType wallForces = {0, 0};
     for (int x = 0; x < walls.size(); x++) {
         std::array<vecType, 2> currentWall = walls[x];
@@ -45,22 +46,24 @@ SYCL_EXTERNAL void differentialEq(int currentIndex, sycl::accessor<Actor, 1, syc
     }
 
     vecType forceSum = personalImpulse + peopleForces + wallForces;
+
+    // Apply random force variations
     forceSum += currentActor->getVariation();
 
+    // Color actor according to heatmap
     if (currentActor->getHeatmapEnabled()) {
-        auto colorVal = std::fabs((forceSum[0] + forceSum[1]) / 700.0f);
+        auto colorVal = sycl::fabs((forceSum[0] + forceSum[1]) / 700.0f);
         if (colorVal > 1) { colorVal = 1.0f; }
         auto color = findColor(colorVal);
         currentActor->setColor({int(color[0]), int(color[1]), int(color[2])});
     }
 
-    vecType acceleration = forceSum / mi;
-
-    //out << "People Forces: (" << peopleForces[0] << ", " << peopleForces[1] << ")    " << z << sycl::endl;
-    //out << "Wall Forces: (" << wallForces[0] << ", " << wallForces[1] << ")    " << z << sycl::endl;
-    //out << "Acceleration: (" << acceleration[0] << ", " << acceleration[1] << ")    " << z << sycl::endl;
-    //out << "-----------------------" << sycl::endl;
+    // out << "People Forces: (" << peopleForces[0] << ", " << peopleForces[1] << ")    " << z << sycl::endl;
+    // out << "Wall Forces: (" << wallForces[0] << ", " << wallForces[1] << ")    " << z << sycl::endl;
+    // out << "Acceleration: (" << acceleration[0] << ", " << acceleration[1] << ")    " << z << sycl::endl;
+    // out << "-----------------------" << sycl::endl;
 
+    vecType acceleration = forceSum / mi;
     currentActor->setVelocity(vi + acceleration * TIMESTEP);
     currentActor->setPos(pos + currentActor->getVelocity() * TIMESTEP);
 

external/Heatmap.cpp

@@ -2,8 +2,8 @@
 
 SYCL_EXTERNAL std::array<float, 3> HSVtoRGB(float h, float s, float v) {
     float c = v * s;
-    float scaledH = std::fmod(h / 60.0, 6);
-    float x = c * (1 - std::fabs(std::fmod(scaledH, 2) - 1));
+    double scaledH = sycl::fmod(h / 60.0, 6.0);
+    float x = c * (1 - sycl::fabs(sycl::fmod(scaledH, 2.0) - 1));
     float m = v - c;
 
     std::array<float, 3> rgb = {};
@@ -15,7 +15,7 @@ SYCL_EXTERNAL std::array<float, 3> HSVtoRGB(float h, float s, float v) {
     else if (4 <= scaledH && scaledH < 5) { rgb[0] = x; rgb[1] = 0; rgb[2] = c; }
     else if (5 <= scaledH && scaledH < 6) { rgb[0] = c; rgb[1] = 0; rgb[2] = x; }
     else { rgb[0] = 0; rgb[1] = 0; rgb[2] = 0; }
-
+    
     return rgb;
 }
 

external/MathHelper.cpp

@@ -13,7 +13,7 @@ SYCL_EXTERNAL vecType velToPoint(float speed, vecType pos, vecType destination)
 }
 
 SYCL_EXTERNAL float magnitude(vecType inp) {
-    return std::sqrt((inp[0] * inp[0]) + (inp[1] * inp[1]));
+    return sycl::sqrt((inp[0] * inp[0]) + (inp[1] * inp[1]));
 }
 
 SYCL_EXTERNAL float inverseMagnitude(vecType inp) {
@@ -51,8 +51,8 @@ SYCL_EXTERNAL std::pair<float, vecType> getDistanceAndNiw(vecType point, std::ar
         float lSquared = dotProduct(AB, AB);
         if (lSquared == 0.0) {
             return {0, {0, 0}};
-        }
-        float t = std::max(0.0f, std::min(1.0f, dotProduct(AP, AB) / lSquared));
+        } 
+        float t = sycl::max(0.0f, sycl::min(1.0f, dotProduct(AP, AB) / lSquared));
         auto projection = t * AB;
 
         return {distance(AP, projection), normalize(AP - projection)};

src/main.cpp

@@ -19,11 +19,13 @@ int SCALE;
 int DELAY;
 
 void init(SDL_Window* &win, SDL_Renderer* &render, std::vector<Actor> &actors, Room &room, std::vector<Path> &paths, int argc, char **argv) {
+    // Read from input file path JSON
     if (argc > 1) {
         std::string inputPath = argv[1];
         parseInputFile(inputPath, actors, room, paths, WIDTH, HEIGHT, SCALE, DELAY);
     }
 
+    // Initialise SDL
     SDL_Init(SDL_INIT_VIDEO);
     win = SDL_CreateWindow("SYCL Crowd Simulation", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH * SCALE, HEIGHT * SCALE, SDL_WINDOW_SHOWN);
     render = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED);
@@ -97,8 +99,8 @@ void close(SDL_Window* win, SDL_Renderer* render) {
 }
 
 int main(int argc, char *argv[]) {
-    SDL_Window* win = NULL;
-    SDL_Renderer* render = NULL;
+    SDL_Window* win;
+    SDL_Renderer* render;
 
     std::vector<Actor> actors;
     Room room = Room({});
@@ -114,34 +116,13 @@ int main(int argc, char *argv[]) {
     bool isQuit = false;
     SDL_Event event;
 
-    // const float dt = 0.00001f;
-    // float accumulator = 0.0f;
-    // float currentTime = SDL_GetTicks();
-
     while(!isQuit) {
         if (SDL_PollEvent(&event)) {
             if (event.type == SDL_QUIT) {
                 isQuit = true;
             }
         }
 
-        // float newTime = SDL_GetTicks();
-        // float frameTime = newTime - currentTime;
-        // currentTime = 0.2f * newTime;
-        // accumulator += frameTime;
-
-        // while (accumulator >= dt) {
-        //     if (SDL_PollEvent(&event)) {
-        //         if (event.type == SDL_QUIT) {
-        //             isQuit = true;
-        //             break;
-        //         }
-        //     }
-        //     update(myQueue, actors, room);
-        //     draw(render, actors, room);
-        //     accumulator -= dt;
-        // }
-
         if (delayCounter >= DELAY) {
             delayCounter = 0;
             update(myQueue, actors, room, paths);