automate compiling with Intel's ispc during the build process

jvo203 · Jan 1, 2019 · 0563f69 · 0563f69
1 parent 1d68dfd
commit 0563f69
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 35 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fits_web_ql"
-version = "4.0.8"
+version = "4.0.9"
 authors = ["jvo203 <[email protected]>"]
 edition = "2018"
 
@@ -17,7 +17,8 @@ opencl = ["ocl", "rand"]
 [build-dependencies]
 bindgen = "*"
 metadeps = "*"
-clang = "*"
+#clang = "*"
+ispc = "*"
 
 [package.metadata.pkg-config]
 x265 = "2.8"
@@ -64,6 +65,7 @@ tar = "*"
 flate2 = "*"
 ocl = {version = "*", optional = true}
 rand = {version = "*", optional = true}
+ispc = "*"
 
 #rulinalg = "*"
 #linearkalman = "*"

diff --git a/README.md b/README.md
@@ -66,14 +66,7 @@ https://ispc.github.io
 
 in the "Downloads" section select the binary corresponding to your platform
 
-then place the extracted executable "ispc" in your PATH (for example ~/bin/)
-
-##
-compile the native SIMD code with ispc
-
-cd <your_projects_folder>/fits_web_ql
-
-run "make" (from within the fits_web_ql directory where the Makefile is located)
+then place the extracted executable "ispc" in your PATH (for example ~/bin/ or /usr/local/bin)
 
 ##
 install clang

diff --git a/build.rs b/build.rs
@@ -1,14 +1,23 @@
 extern crate bindgen;
+extern crate ispc;
 extern crate metadeps;
 
 use std::env;
 use std::path::PathBuf;
 
 fn main() {
+    let mut cfg = ispc::Config::new();
+    cfg.optimization_opt(ispc::opt::OptimizationOpt::FastMath);
+    cfg.addressing(ispc::opt::Addressing::A32);
+    let ispc_files = vec!["src/fits.ispc"];
+    for s in &ispc_files[..] {
+        cfg.file(*s);
+    }
+    cfg.compile("spmd");
+    //ispc::compile_library("ispc", &["src/fits.ispc"]);
     // Tell cargo to tell rustc to link the ISPC object file turned into a static library
-    println!("cargo:rustc-link-search=native=native");
-    println!("cargo:rustc-link-lib=static=fits");
-    //println!("cargo:rustc-link-lib=static=thorenc");
+    //println!("cargo:rustc-link-search=native=native");
+    //println!("cargo:rustc-link-lib=static=fits");
 
     println!("cargo:rustc-link-search=native=/usr/local/lib");
     println!("cargo:rustc-link-lib=yuv");

diff --git a/native/.gitignore b/native/.gitignore
diff --git a/src/fits.rs b/src/fits.rs
@@ -512,7 +512,7 @@ impl FITS {
                         mem::forget(data_u8);
 
                         unsafe {
-                            ispc_make_image_spectrumF16_minmax(
+                            spmd::make_image_spectrumF16_minmax(
                                 vec_raw.as_mut_ptr(),
                                 self.bzero,
                                 self.bscale,
@@ -527,7 +527,7 @@ impl FITS {
                         }
                     } else {
                         unsafe {
-                            ispc_make_image_spectrumF32_minmax(
+                            spmd::make_image_spectrumF32_minmax(
                                 data_u8.as_ptr() as *mut i32,
                                 vec_raw.as_mut_ptr(),
                                 self.bzero,
@@ -621,7 +621,7 @@ impl FITS {
                 let mask_raw = slice::from_raw_parts_mut(mask_ptr, total_size);
                 let mask_tid_raw = slice::from_raw_parts_mut(mask_tid_ptr, total_size);
 
-                ispc_join_pixels_masks(
+                spmd::join_pixels_masks(
                     self.pixels.as_mut_ptr(),
                     pixels_tid.as_mut_ptr(),
                     mask_raw.as_mut_ptr(),
@@ -779,7 +779,7 @@ impl FITS {
                         let vec_raw = slice::from_raw_parts_mut(vec_ptr, vec_len);
                         let mask_raw = slice::from_raw_parts_mut(mask_ptr, mask_len);
 
-                        ispc_make_image_spectrumF16_minmax(
+                        spmd::make_image_spectrumF16_minmax(
                             vec_raw.as_mut_ptr(),
                             self.bzero,
                             self.bscale,
@@ -871,7 +871,7 @@ impl FITS {
                 let mask_raw = slice::from_raw_parts_mut(mask_ptr, total_size);
                 let mask_tid_raw = slice::from_raw_parts_mut(mask_tid_ptr, total_size);
 
-                ispc_join_pixels_masks(
+                spmd::join_pixels_masks(
                     self.pixels.as_mut_ptr(),
                     pixels_tid.as_mut_ptr(),
                     mask_raw.as_mut_ptr(),
@@ -2465,7 +2465,7 @@ impl FITS {
                             let vec_raw = slice::from_raw_parts_mut(vec_ptr, vec_len);
                             let mask_raw = slice::from_raw_parts_mut(mask_ptr, mask_len);
 
-                            ispc_make_image_spectrumF16_minmax(
+                            spmd::make_image_spectrumF16_minmax(
                                 vec_raw.as_mut_ptr(),
                                 self.bzero,
                                 self.bscale,
@@ -2527,7 +2527,7 @@ impl FITS {
                 let mask_raw = slice::from_raw_parts_mut(mask_ptr, total_size);
                 let mask_tid_raw = slice::from_raw_parts_mut(mask_tid_ptr, total_size);
 
-                ispc_join_pixels_masks(
+                spmd::join_pixels_masks(
                     pixels.as_mut_ptr(),
                     pixels_tid.as_mut_ptr(),
                     mask_raw.as_mut_ptr(),
@@ -3643,7 +3643,7 @@ impl FITS {
                         let mask_raw = slice::from_raw_parts_mut(mask_ptr, mask_len);
                         let y_raw = slice::from_raw_parts_mut(y_ptr, len);
 
-                        ispc_data_to_luminance_f16_linear(
+                        spmd::data_to_luminance_f16_linear(
                             raw.as_mut_ptr(),
                             mask_raw.as_mut_ptr(),
                             self.bzero,
@@ -3660,7 +3660,7 @@ impl FITS {
                     let mask_raw = slice::from_raw_parts_mut(mask_ptr, mask_len);
                     let y_raw = slice::from_raw_parts_mut(y_ptr, len);
 
-                    ispc_data_to_luminance_f16_logistic(
+                    spmd::data_to_luminance_f16_logistic(
                         raw.as_mut_ptr(),
                         mask_raw.as_mut_ptr(),
                         self.bzero,
@@ -3676,7 +3676,7 @@ impl FITS {
                     let mask_raw = slice::from_raw_parts_mut(mask_ptr, mask_len);
                     let y_raw = slice::from_raw_parts_mut(y_ptr, len);
 
-                    ispc_data_to_luminance_f16_ratio(
+                    spmd::data_to_luminance_f16_ratio(
                         raw.as_mut_ptr(),
                         mask_raw.as_mut_ptr(),
                         self.bzero,
@@ -3692,7 +3692,7 @@ impl FITS {
                     let mask_raw = slice::from_raw_parts_mut(mask_ptr, mask_len);
                     let y_raw = slice::from_raw_parts_mut(y_ptr, len);
 
-                    ispc_data_to_luminance_f16_square(
+                    spmd::data_to_luminance_f16_square(
                         raw.as_mut_ptr(),
                         mask_raw.as_mut_ptr(),
                         self.bzero,
@@ -3709,7 +3709,7 @@ impl FITS {
                     let mask_raw = slice::from_raw_parts_mut(mask_ptr, mask_len);
                     let y_raw = slice::from_raw_parts_mut(y_ptr, len);
 
-                    ispc_data_to_luminance_f16_legacy(
+                    spmd::data_to_luminance_f16_legacy(
                         raw.as_mut_ptr(),
                         mask_raw.as_mut_ptr(),
                         self.bzero,
@@ -5041,7 +5041,7 @@ impl FITS {
                 unsafe {
                     let raw = slice::from_raw_parts_mut(ptr, len);
 
-                    let spectrum = ispc_calculate_radial_spectrumF16(
+                    let spectrum = spmd::calculate_radial_spectrumF16(
                         raw.as_mut_ptr(),
                         self.bzero,
                         self.bscale,
@@ -5229,7 +5229,7 @@ impl FITS {
                 unsafe {
                     let raw = slice::from_raw_parts_mut(ptr, len);
 
-                    let spectrum = ispc_calculate_square_spectrumF16(
+                    let spectrum = spmd::calculate_square_spectrumF16(
                         raw.as_mut_ptr(),
                         self.bzero,
                         self.bscale,

diff --git a/src/main.rs b/src/main.rs
@@ -5,6 +5,12 @@
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
+#[macro_use]
+extern crate ispc;
+
+// Functions exported from ispc will be callable under spmd::*
+ispc_module!(spmd);
+
 #[macro_use]
 extern crate scan_fmt;
 
@@ -2210,8 +2216,8 @@ lazy_static! {
 #[cfg(feature = "server")]
 static LOG_DIRECTORY: &'static str = "LOGS";
 
-static SERVER_STRING: &'static str = "FITSWebQL v4.0.8";
-static VERSION_STRING: &'static str = "SV2018-12-31.2";
+static SERVER_STRING: &'static str = "FITSWebQL v4.0.9";
+static VERSION_STRING: &'static str = "SV2019-01-01.0";
 static WASM_STRING: &'static str = "WASM2018-12-17.0";
 
 #[cfg(not(feature = "server"))]

diff --git a/wrapper.h b/wrapper.h
@@ -1,7 +1,5 @@
 #include <stdbool.h>
 
-#include "native/fits.h"
-
 #include <libyuv/scale.h>
 
 #include <x265.h>