Remove OpenGL support (part 1) #5626

steven-johnson · 2021-01-09T01:29:08Z

This removes the OpenGL backend (but not the OpenGLCompute backend) from public use:

Remove Target::OpenGL
remove DeviceAPI::GLSL
remove Func::glsl() and Func::shader()
remove all OpenGL-specific apps and tests
remove HalideRuntimeOpenGL.h
remove some internal code that is OpenGL-only

Note that there is still internal code that needs trimming; since the OpenGLCompute backend uses some of the same code, and some of the same build deps, and some of the same runtime shared-library loading, I tried to err on the side of leaving code/buildrules/etc in place for now, with the plan to clean that up in subsequent PRs.

Note also that feature Target::EGL is still present, as I believe it is still useful in conjunction with OpenGLCompute.

Fixes #5475 This removes the OpenGL backend (but *not* the OpenGLCompute backend) from public use: - Remove Target::OpenGL - remove DeviceAPI::GLSL - remove Func::glsl() and Func::shader() - remove all OpenGL-specific apps and tests - remove HalideRuntimeOpenGL.h - remove some internal code that is OpenGL-only Note that there is still internal code that needs trimming; since the OpenGLCompute backend uses some of the same code, and some of the same build deps, and some of the same runtime shared-library loading, I tried to err on the side of leaving code/buildrules/etc in place for now, with the plan to clean that up in subsequent PRs. Note also that feature Target::EGL is still present, as I believe it is still useful in conjunction with OpenGLCompute.

dsharletg · 2021-01-09T01:37:04Z

src/runtime/runtime_api.cpp

-    (void *)&halide_opengl_run,
-    (void *)&halide_opengl_wrap_render_target,
-    (void *)&halide_opengl_wrap_texture,
+    // (void *)&halide_opengl_context_lost,


Why comment and not delete?

...scalpel left in patient, sorry, fixing

Actually, halide_opengl_create_context and halide_opengl_get_proc_address still appear to be needed by OpenGLCompute

steven-johnson · 2021-01-12T00:09:48Z

Only failure is the rogue mul_div_mod failure:

FAILED TEST: mul_div_mod
Testing mul vector_width: 1
Testing mul vector_width: 2
Testing mul vector_width: 4
Testing mul vector_width: 8
Testing mul vector_width: 16
Testing div_mod vector_width: 1
Testing div_mod vector_width: 2
Testing div_mod vector_width: 4
Testing div_mod vector_width: 8
Testing div_mod vector_width: 16
Failure!
0*-2147483648 -> -2147483648 != 0
Compiled a*b != simplified a*b: 0*-2147483648 = -2147483648 != 0
0*2147483647 -> 2147464527 != 0
Compiled a*b != simplified a*b: 0*2147483647 = 2147464527 != 0
65535*156429877 -> 946612400 != -454946357
23964*-1339975209 -> -1705444715 != -1990403580
47774*672691988 -> 1426553552 != -2053241256
52075*-387718748 -> 419095856 != 187456396
53663*975805134 -> -2138888350 != 389633010
19650*418751201 -> 1851754037 != -696239486
0*-2147483648 -> -2147483648 != 0
Compiled a*b != simplified a*b: 0*-2147483648 = -2147483648 != 0
0*2147483647 -> 2147464527 != 0
Compiled a*b != simplified a*b: 0*2147483647 = 2147464527 != 0
65535*156429877 -> 946612400 != -454946357
23964*-1339975209 -> -1705444715 != -1990403580
47774*672691988 -> 1426553552 != -2053241256
52075*-387718748 -> 419095856 != 187456396
53663*975805134 -> -2138888350 != 389633010
19650*418751201 -> 1851754037 != -696239486
make: *** [/home/halidenightly/build_bot/worker/x86-64-linux-testbranch-11-make/halide-source/Makefile:1820: quiet_correctness_mul_div_mod] Error 1
make: *** Waiting for unfinished jobs....

abadams · 2021-01-12T00:25:33Z

README_cmake.md

@@ -466,6 +464,8 @@ If the CMake version is lower than 3.18, the deprecated [`FindCUDA`][findcuda]
 module will be used instead. It reads the variable `CUDA_TOOLKIT_ROOT_DIR`
 instead of `CUDAToolkit_ROOT` above.

+TODO: update this section for OpenGLCompute, which needs some (but maybe not all) of this.


Were you planning to get to this TODO before merging?

Well, I was, but since OpenGLCompute is ~untestable on desktop Linux until we fix the LLVM-exports issues (see #5627), I think it's probably more useful to leave these as TODO (but open an Issue to fix them once OpenGLCompute is testable again)...

abadams · 2021-01-12T00:26:53Z

src/StorageFlattening.cpp

        if (op->for_type == ForType::GPUBlock ||
            op->for_type == ForType::GPUThread) {
            in_gpu = true;
        }
+        // TODO: in_shader = true is no longer possible, clean up code accordingly


I believe the branch that adds texture support for cuda might need this

Please point me at branch?

It doesn't appear to use in_shader -- it adds a new clause to preserve the device-api

abadams · 2021-01-12T00:27:53Z

There are possibly some now unused intrinsics in IR.cpp: glsl_texture_*

steven-johnson · 2021-01-12T00:39:54Z

There are possibly some now unused intrinsics in IR.cpp: glsl_texture_*

Done

#5626 removed OpenGL support, but didn't remove this no-longer-needed class.

alexreinking · 2021-01-12T21:13:01Z

src/CMakeLists.txt

-option(TARGET_OPENGL "Include OpenGL/GLSL target" ON)
-if (TARGET_OPENGL)
-    target_compile_definitions(Halide PRIVATE WITH_OPENGL)
-endif ()
-


Uh oh! This breaks openglcompute! That macro is used later to enable OGLC stuff.

alexreinking · 2021-01-12T21:13:29Z

src/Target.cpp

 #if !defined(WITH_OPENGL)
-    bad |= has_feature(Target::OpenGL) || has_feature(Target::OpenGLCompute);
+    bad |= has_feature(Target::OpenGLCompute);
 #endif


This is never defined via CMake after this PR.

Inadvertently removed code for properly enabling/disabling OGLC in #5626, this restores it properly

steven-johnson added 2 commits January 8, 2021 17:21

WIP

05e427d

steven-johnson added the release_notes For changes that may warrant a note in README for official releases. label Jan 9, 2021

steven-johnson added this to the v12.0.0 milestone Jan 9, 2021

dsharletg approved these changes Jan 9, 2021

View reviewed changes

steven-johnson added 6 commits January 8, 2021 17:44

Update runtime_api.cpp

f0c0bb2

Update target.cpp

c49b169

Update Generator.cpp

0914d57

Update Generator.cpp

8f629eb

Update Generator.cpp

a80a371

Update LLVM_Runtime_Linker.cpp

593accb

dsharletg mentioned this pull request Jan 11, 2021

Don't include sources for disabled targets #5503

Closed

steven-johnson marked this pull request as ready for review January 12, 2021 00:10

steven-johnson requested review from abadams and shoaibkamil January 12, 2021 00:10

abadams reviewed Jan 12, 2021

View reviewed changes

Remove glsl-specific intrinsics.

55eb19f

steven-johnson added 2 commits January 11, 2021 16:42

Update IR.cpp

709416e

Remove shader-specific code in FlattenDimensions

dcde5de

abadams approved these changes Jan 12, 2021

View reviewed changes

shoaibkamil approved these changes Jan 12, 2021

View reviewed changes

Merge branch 'master' into srj/remove-opengl

862d4d2

steven-johnson mentioned this pull request Jan 12, 2021

Update README and build files for OpenGLCompute requirements #5633

Closed

Update TODOs

b434684

steven-johnson merged commit 27f55dd into master Jan 12, 2021

steven-johnson deleted the srj/remove-opengl branch January 12, 2021 17:55

steven-johnson added a commit that referenced this pull request Jan 12, 2021

Remove CodeGen_OpenGL_Dev

bc38739

#5626 removed OpenGL support, but didn't remove this no-longer-needed class.

steven-johnson mentioned this pull request Jan 12, 2021

Remove CodeGen_OpenGL_Dev #5635

Merged

alexreinking reviewed Jan 12, 2021

View reviewed changes

steven-johnson added a commit that referenced this pull request Jan 12, 2021

Add TARGET_OPENGLCOMPUTE

841d5a1

Inadvertently removed code for properly enabling/disabling OGLC in #5626, this restores it properly

steven-johnson mentioned this pull request Jan 12, 2021

Add TARGET_OPENGLCOMPUTE #5637

Merged

steven-johnson added a commit that referenced this pull request Jan 13, 2021

Add TARGET_OPENGLCOMPUTE (#5637)

6620563

Inadvertently removed code for properly enabling/disabling OGLC in #5626, this restores it properly

dsharletg mentioned this pull request Jan 19, 2021

Move CodeGen_GPU_Host to a lowering pass #5650

Closed

alexreinking removed the release_notes For changes that may warrant a note in README for official releases. label Apr 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove OpenGL support (part 1) #5626

Remove OpenGL support (part 1) #5626

steven-johnson commented Jan 9, 2021

dsharletg Jan 9, 2021

steven-johnson Jan 9, 2021

steven-johnson Jan 9, 2021

steven-johnson commented Jan 12, 2021

abadams Jan 12, 2021

steven-johnson Jan 12, 2021

abadams Jan 12, 2021

steven-johnson Jan 12, 2021

abadams Jan 12, 2021

steven-johnson Jan 12, 2021

abadams commented Jan 12, 2021

steven-johnson commented Jan 12, 2021

alexreinking Jan 12, 2021

alexreinking Jan 12, 2021

Remove OpenGL support (part 1) #5626

Remove OpenGL support (part 1) #5626

Conversation

steven-johnson commented Jan 9, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

steven-johnson commented Jan 12, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abadams commented Jan 12, 2021

steven-johnson commented Jan 12, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment