diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
index 3b17f47dd0..b9bd805401 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
@@ -727,6 +727,38 @@ TEST(OfflineCompilerTest, buildSourceCode) {
     EXPECT_NE(0u, mockOfflineCompiler->genBinarySize);
 }
 
+TEST(OfflineCompilerTest, givenSpvOnlyOptionPassedWhenCmdLineParsedThenGenerateOnlySpvFile) {
+    std::vector<std::string> argv = {
+        "ocloc",
+        "-file",
+        "test_files/copybuffer.cl",
+        "-output",
+        "myOutputFileName",
+        "-spv_only",
+        "-device",
+        gEnvironment->devicePrefix.c_str()};
+
+    auto mockOfflineCompiler = std::unique_ptr<MockOfflineCompiler>(new MockOfflineCompiler());
+    ASSERT_NE(nullptr, mockOfflineCompiler);
+
+    auto retVal = mockOfflineCompiler->initialize(argv.size(), argv);
+    EXPECT_EQ(CL_SUCCESS, retVal);
+
+    EXPECT_FALSE(compilerOutputExists("myOutputFileName", "bc") || compilerOutputExists("myOutputFileName", "spv"));
+    EXPECT_FALSE(compilerOutputExists("myOutputFileName", "bin"));
+    EXPECT_FALSE(compilerOutputExists("myOutputFileName", "gen"));
+
+    retVal = mockOfflineCompiler->build();
+    EXPECT_EQ(CL_SUCCESS, retVal);
+
+    EXPECT_TRUE(compilerOutputExists("myOutputFileName", "bc") || compilerOutputExists("myOutputFileName", "spv"));
+    EXPECT_FALSE(compilerOutputExists("myOutputFileName", "bin"));
+    EXPECT_FALSE(compilerOutputExists("myOutputFileName", "gen"));
+
+    compilerOutputRemove("myOutputFileName", "bc");
+    compilerOutputRemove("myOutputFileName", "spv");
+}
+
 TEST(OfflineCompilerTest, GivenKernelWhenNoCharAfterKernelSourceThenBuildWithSuccess) {
     auto mockOfflineCompiler = std::unique_ptr<MockOfflineCompiler>(new MockOfflineCompiler());
     ASSERT_NE(nullptr, mockOfflineCompiler);
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index 80f3b9979d..19a982337c 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -203,8 +203,11 @@ int OfflineCompiler::buildSourceCode() {
 
 int OfflineCompiler::build() {
     int retVal = SUCCESS;
-
-    retVal = buildSourceCode();
+    if (isOnlySpirV()) {
+        retVal = buildIrBinary();
+    } else {
+        retVal = buildSourceCode();
+    }
     generateElfBinary();
     if (dumpFiles) {
         writeOutAllFiles();
@@ -514,6 +517,8 @@ int OfflineCompiler::parseCommandLine(size_t numArgs, const std::vector<std::str
         } else if ("-q" == currArg) {
             argHelper->getPrinterRef() = MessagePrinter(true);
             quiet = true;
+        } else if ("-spv_only" == currArg) {
+            onlySpirV = true;
         } else if ("-output_no_suffix" == currArg) {
             outputNoSuffix = true;
         } else if ("--help" == currArg) {
@@ -770,6 +775,8 @@ Usage: ocloc [compile] -file <filename> -device <device_type> [-output <filename
 
   -q                            Will silence most of output messages.
 
+  -spv_only                     Will generate only spirV file.
+
   -cpp_file                     Will generate c++ file with C-array
                                 containing Intel Compute device binary.
 
diff --git a/shared/offline_compiler/source/offline_compiler.h b/shared/offline_compiler/source/offline_compiler.h
index 74b9e1fcf3..8cbc58e016 100644
--- a/shared/offline_compiler/source/offline_compiler.h
+++ b/shared/offline_compiler/source/offline_compiler.h
@@ -57,6 +57,10 @@ class OfflineCompiler {
         return quiet;
     }
 
+    bool isOnlySpirV() const {
+        return onlySpirV;
+    }
+
     std::string parseBinAsCharArray(uint8_t *binary, size_t size, std::string &fileName);
 
     static bool readOptionsFromFile(std::string &optionsOut, const std::string &file, OclocArgHelper *helper);
@@ -114,6 +118,7 @@ class OfflineCompiler {
     bool useCppFile = false;
     bool useOptionsSuffix = false;
     bool quiet = false;
+    bool onlySpirV = false;
     bool inputFileLlvm = false;
     bool inputFileSpirV = false;
     bool outputNoSuffix = false;