Continue H2yaml migration (#485)

Author: TApplencourt

.github/actions/setup-thapi/action.yml

@@ -34,7 +34,7 @@ runs:
       packages: gcc g++ ruby ruby-dev elfutils libelf-dev libpopt-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libc6-dbg libglib2.0-dev libnuma-dev
   - name: Install Ruby Dependencies
     shell: bash
-    run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
+    run: sudo gem install nokogiri babeltrace2 opencl_ruby_ffi metababel cast-to-yaml
   - name: Set PKG_CONFIG
     shell: bash
     run: |

README.md

@@ -76,15 +76,14 @@ Optional packages:
  - `binutils-dev` or `libiberty-dev` for demangling depending on platforms (`demangle.h`)
 
 Ruby Gems:
- - `cast-to-yaml`
  - `nokogiri`
  - `babeltrace2`
  - `metababel`
 
 Optional Gem:
  - `opencl_ruby_ffi`
 
-Optional pip:
+Required pip:
  - `h2yaml`
 
 </details>

backends/cuda/Makefile.am

@@ -77,20 +77,23 @@ clean-local:
 
 EXTRA_DIST += $(srcdir)/include headers.patch
 
-CUDA_EXTRACT = \
-	$(srcdir)/extract_base.rb
+CUDA_EXTRACT_H = $(srcdir)/extract/cuda_api.h $(srcdir)/extract/cudart_api.h
+EXTRA_DIST += $(CUDA_EXTRACT_H)
 
 cuda_api_versions.yaml: $(srcdir)/extract_cuda_versions.rb modified_include/cudaTypedefs.h modified_include/cudaVDPAUTypedefs.h modified_include/cudaProfilerTypedefs.h
 	$(RUBY) $^ > $@
 
-cuda_api.yaml: $(srcdir)/extract_cuda.rb $(CUDA_EXTRACT) modified_include/cuda.h modified_include/cudaVDPAU.h
-	ENABLE_CLANG_PARSER=$(ENABLE_CLANG_PARSER) $(RUBY) $<
+cuda_api.yaml: $(srcdir)/extract/cuda_api.h $(MODIFIED_CUDA_HDR)
+	h2yaml --compat-cast-to-yaml -Wc,-Imodified_include/ $< > $@
 
-cuda_exports_api.yaml: $(srcdir)/extract_cuda_exports.rb $(CUDA_EXTRACT) modified_include/cuda.h cuda_export_tables.yaml
-	ENABLE_CLANG_PARSER=$(ENABLE_CLANG_PARSER) SRC_DIR=$(srcdir) $(RUBY) $<
+cuda_exports_extract.h: $(srcdir)/gen_cuda_exports_extract.rb $(srcdir)/cuda_export_tables.yaml $(MODIFIED_CUDA_HDR)
+	SRC_DIR=$(srcdir) $(RUBY) $< > $@
+
+cuda_exports_api.yaml: cuda_exports_extract.h $(MODIFIED_CUDA_HDR)
+	h2yaml --compat-cast-to-yaml -Wc,-Imodified_include/ --filter-header cuda_exports_extract $< > $@
 
-cudart_api.yaml: $(srcdir)/extract_cudart.rb $(CUDA_EXTRACT) modified_include/cuda_runtime_api.h
-	ENABLE_CLANG_PARSER=$(ENABLE_CLANG_PARSER) $(RUBY) $<
+cudart_api.yaml: $(srcdir)/extract/cudart_api.h $(MODIFIED_CUDA_HDR)
+	h2yaml --compat-cast-to-yaml -Wc,-Imodified_include/ $< > $@
 
 CUDA_EXTRACTED = \
 	cuda_api.yaml \
@@ -100,14 +103,11 @@ CUDA_EXTRACTED = \
 CUDART_EXTRACTED = \
 	cudart_api.yaml
 
-CLEANFILES += $(CUDA_EXTRACTED) $(CUDART_EXTRACTED)
+CLEANFILES += $(CUDA_EXTRACTED) $(CUDART_EXTRACTED) cuda_exports_extract.h
 
 EXTRA_DIST += \
-	extract_base.rb \
-	extract_cuda.rb \
-	extract_cuda_exports.rb \
-	extract_cuda_versions.rb \
-	extract_cudart.rb
+	gen_cuda_exports_extract.rb \
+	extract_cuda_versions.rb
 
 cuda_exports.h.include: $(srcdir)/gen_cude_exports_include.rb cuda_export_tables.yaml
 	SRC_DIR=$(srcdir) $(RUBY) $< > $@

backends/cuda/extract/cuda_api.h

@@ -0,0 +1,18 @@
+#define __CUDA_API_VERSION_INTERNAL = 1
+#define THAPI_NO_INCLUDE
+
+#include <stdint.h>
+
+#include <cuda.h>
+
+typedef int32_t VdpStatus;
+typedef uint32_t VdpFuncId;
+typedef uint32_t VdpDevice;
+typedef VdpStatus
+VdpGetProcAddress(VdpDevice device, VdpFuncId function_id, void **function_pointer);
+typedef uint32_t VdpVideoSurface;
+typedef uint32_t VdpOutputSurface;
+
+#include <cudaVDPAU.h>
+
+#include <cudaProfiler.h>

backends/cuda/extract/cudart_api.h

@@ -0,0 +1,20 @@
+#define __CUDA_API_VERSION_INTERNAL = 1
+#define THAPI_NO_INCLUDE
+
+#include <stdint.h>
+
+#include <cuda_runtime_api.h>
+
+#include <__cudart.h>
+
+typedef int32_t VdpStatus;
+typedef uint32_t VdpFuncId;
+typedef uint32_t VdpDevice;
+typedef VdpStatus
+VdpGetProcAddress(VdpDevice device, VdpFuncId function_id, void **function_pointer);
+typedef uint32_t VdpVideoSurface;
+typedef uint32_t VdpOutputSurface;
+
+#include <cuda_vdpau_interop.h>
+
+#include <cuda_profiler_api.h>

backends/cuda/extract_base.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+
+SRC_DIR = ENV['SRC_DIR'] || '.'
+export_tables = YAML.load_file(File.join(SRC_DIR, 'cuda_export_tables.yaml'))
+
+puts <<~EOF
+  #define __CUDA_API_VERSION_INTERNAL=1
+  #define THAPI_NO_INCLUDE
+  #include <cuda.h>
+EOF
+
+export_tables.each do |table|
+  if table['structures']
+    table['structures'].each do |struct|
+      puts <<~EOF
+          typedef
+        #{struct['declaration']}
+          #{struct['name']};
+      EOF
+    end
+  end
+  table['functions'].each do |function|
+    puts <<~EOF
+      #{function['declaration']};
+    EOF
+  end
+end