updating pocl and formating scripts

Author: talubik

build_vortex.py

@@ -6,48 +6,44 @@
 
 def run_command(command, cwd=None):
     print(f"Running command: {command}")
-    result = subprocess.run(command, shell=True, cwd=cwd, executable='/bin/bash')
+    result = subprocess.run(command, shell=True, cwd=cwd, executable="/bin/bash")
     if result.returncode != 0:
         print(f"Command failed with return code {result.returncode}")
         sys.exit(result.returncode)
 
+
 def main():
     project_root = os.path.dirname(os.path.abspath(__file__))
-    
 
     vortex_source_dir = os.path.join(project_root, "deps/vortex")
     pocl_source_dir = os.path.join(project_root, "deps/pocl")
-    
+
     vortex_build_dir = os.path.join(vortex_source_dir, "build")
     tool_dir = os.path.join(project_root, "vortex-tools")
     pocl_tool_path = os.path.join(tool_dir, "pocl")
-   
+
     os.makedirs(vortex_build_dir, exist_ok=True)
     os.makedirs(tool_dir, exist_ok=True)
     if os.path.exists(pocl_tool_path):
         shutil.rmtree(pocl_tool_path)
-    
+
     vortex_source_rel_to_build = os.path.relpath(vortex_source_dir, vortex_build_dir)
     pocl_source_rel_to_build = os.path.relpath(pocl_source_dir, vortex_build_dir)
     tool_dir_rel_to_build = os.path.relpath(tool_dir, vortex_build_dir)
 
-    
     configure_cmd = (
         f"{vortex_source_rel_to_build}/configure --xlen=64 --tooldir={tool_dir} && "
         f"TOOLDIR={tool_dir_rel_to_build} ./ci/toolchain_install.sh --all"
     )
     run_command(configure_cmd, cwd=vortex_build_dir)
 
-   
-    build_cmd = (
-        f"source {vortex_build_dir}/ci/toolchain_env.sh && make -s"
-    )
+    build_cmd = f"source {vortex_build_dir}/ci/toolchain_env.sh && make -s"
     run_command(build_cmd, cwd=vortex_build_dir)
 
-   
     pocl_build_script_path = os.path.join(vortex_build_dir, "build_pocl.sh")
     with open(pocl_build_script_path, "w") as f:
-        f.write(f"""
+        f.write(
+            f"""
 #!/bin/bash
 set -ex
 echo "--- Building POCL for Vortex ---"
@@ -63,12 +59,14 @@ def main():
 make install
 cp -r ../include "$POCL_PATH"
 echo "--- POCL build finished ---"
-        """)
-    
+        """
+        )
+
     os.chmod(pocl_build_script_path, 0o755)
     run_command("./build_pocl.sh", cwd=vortex_build_dir)
 
     print("--- Vortex and POCL build finished successfully! ---")
 
+
 if __name__ == "__main__":
     main()

configure_vortex.py

@@ -1,6 +1,7 @@
 import argparse
 import subprocess
 
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("--vortex-dir", help="path to vortex directory")
@@ -9,39 +10,48 @@ def main():
     parser.add_argument("--cores", help="count of cores")
     parser.add_argument("--threads", help="count of threads", type=int, default=4)
     parser.add_argument("--clusters", help="count of clusters")
-    args=parser.parse_args()
-    vortex_config_args= [f"{args.vortex_dir}/build/ci/blackbox.sh","--app=opencl/vecadd"]
+    parser.add_argument("--l2cache", help="l2cache")
+    parser.add_argument("--l3cache", help="l3cache")
+    args = parser.parse_args()
+    vortex_config_args = [
+        f"{args.vortex_dir}/build/ci/blackbox.sh",
+        "--app=opencl/vecadd",
+    ]
     if args.driver:
-        vortex_config_args+=  [f"--driver={args.driver}"]
+        vortex_config_args += [f"--driver={args.driver}"]
     if args.warps:
-        vortex_config_args+=  [f"--warps={args.warps}"]
+        vortex_config_args += [f"--warps={args.warps}"]
     if args.cores:
-        vortex_config_args+=  [f"--cores={args.cores}"]
+        vortex_config_args += [f"--cores={args.cores}"]
     if args.threads:
-        vortex_config_args+=  [f"--threads={args.threads}"]
+        vortex_config_args += [f"--threads={args.threads}"]
     if args.clusters:
-        vortex_config_args+=  [f"--clusters={args.clusters}"]
-    result=subprocess.run(vortex_config_args,
-                          capture_output=True, text=True)
-    export_line=None
-    if result.returncode!=0:
+        vortex_config_args += [f"--clusters={args.clusters}"]
+    if args.l2cache:
+        if int(args.l2cache) == 1:
+            vortex_config_args += [f"--l2cache"]
+    if args.l3cache:
+        if int(args.l3cache) == 1:
+            vortex_config_args += [f"--l3cache"]
+    result = subprocess.run(
+        vortex_config_args, capture_output=True, text=True, timeout=55.0
+    )
+    export_line = None
+    if result.returncode != 0:
         return
     for line in result.stdout.split("\n"):
         if line.startswith("LD_LIBRARY_PATH="):
-            export_line=line
+            export_line = line
             break
         if line.startswith("SCOPE_JSON_PATH="):
-            export_line=line
+            export_line = line
             break
 
     if export_line is None:
-        return     
-          
-    print(f"export {" ".join(export_line.split()[:-2])}")
-    
-    
+        return
 
+    print(f"export {" ".join(export_line.split()[:-2])}")
 
 
-if __name__ == '__main__':
-    main()
+if __name__ == "__main__":
+    main()

deps/pocl/lib/CL/devices/vortex/pocl-vortex.c

@@ -161,7 +161,6 @@ pocl_vortex_init (unsigned j, cl_device_id dev, const char* parameters)
   }
 
   dev->vendor = "Vortex Group";
-  dev->long_name = "Vortex OpenGPU";
   dev->short_name = "Vortex";
   dev->vendor_id = 0;
   dev->type = CL_DEVICE_TYPE_GPU;
@@ -236,6 +235,15 @@ pocl_vortex_init (unsigned j, cl_device_id dev, const char* parameters)
     free(dd);
     return CL_DEVICE_NOT_FOUND;
   }
+  char* long_name = (char *)malloc(64 * sizeof(char));
+  if (long_name == NULL)
+  {
+    vx_dev_close(vx_device);
+    free(dd);
+    return CL_OUT_OF_HOST_MEMORY;
+  }
+  snprintf(long_name, 64 * sizeof(char), "Vortex OpenGPU W%luT%lu", num_warps, num_threads);
+  dev->long_name = long_name;
 
   uint64_t max_work_group_size = num_warps * num_threads;
 
@@ -283,9 +291,9 @@ cl_int pocl_vortex_uninit (unsigned j, cl_device_id dev) {
 
 int pocl_vortex_init_context (cl_device_id dev, cl_context context) {
   vortex_device_data_t *dd = (vortex_device_data_t *)dev->data;
-  if (NULL == dd) {
-      pocl_vortex_init(0, dev, NULL);
-      dd = (vortex_device_data_t*) dev->data;
+  if (dd == NULL){
+    pocl_vortex_init(0,dev,NULL);
+    dd = (vortex_device_data_t *)dev->data;
   }
 
   dd->ctx_refcount++;
@@ -310,7 +318,6 @@ int pocl_vortex_post_build_program (cl_program program, cl_uint device_i) {
   cl_device_id dev = program->devices[device_i];
   vortex_device_data_t *ddata = (vortex_device_data_t *)dev->data;
   vortex_program_data_t *pdata = NULL;
-
   POCL_LOCK (ddata->compile_lock);
 
   do {
@@ -580,6 +587,7 @@ void pocl_vortex_run (void *data, _cl_command_node *cmd) {
   // release previous kernel buffer
   if (dd->vx_kernel_buffer != NULL)
   {
+    vx_dump_perf(dd->vx_device, stdout);
     vx_mem_free(dd->vx_kernel_buffer);
     dd->vx_kernel_buffer = NULL;
   }
@@ -757,8 +765,8 @@ void pocl_vortex_submit (_cl_command_node *node, cl_command_queue cq) {
 
 void pocl_vortex_flush (cl_device_id dev, cl_command_queue cq) {
   vortex_device_data_t *dd = (vortex_device_data_t *)dev->data;
-  if (dd == NULL)
-      return;
+  if(dd == NULL)
+    return;
   POCL_LOCK (dd->cq_lock);
   vortex_command_scheduler (dd);
   POCL_UNLOCK (dd->cq_lock);